From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 18 Jun 2013 21:20:07 +0000 (+0200)
Subject: Merge branch '3.10-fixes' into mips-for-linux-next
X-Git-Tag: next-20130619~105^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aedc598da0c5c35633e9b2b11913bf8f8021f3d6;p=karo-tx-linux.git

Merge branch '3.10-fixes' into mips-for-linux-next
---

aedc598da0c5c35633e9b2b11913bf8f8021f3d6
diff --cc arch/mips/cavium-octeon/Makefile
index b703583779fb,e3fd50cc709c..4e952043c922
--- a/arch/mips/cavium-octeon/Makefile
+++ b/arch/mips/cavium-octeon/Makefile
@@@ -12,8 -12,8 +12,8 @@@
  CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt
  CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt
  
 -obj-y := cpu.o setup.o serial.o octeon-platform.o octeon-irq.o csrc-octeon.o
 +obj-y := cpu.o setup.o octeon-platform.o octeon-irq.o csrc-octeon.o
- obj-y += dma-octeon.o flash_setup.o
+ obj-y += dma-octeon.o
  obj-y += octeon-memcpy.o
  obj-y += executive/
  
diff --cc arch/mips/include/uapi/asm/fcntl.h
index 314c79b76d2a,6e9e74648f98..6ca432f00860
--- a/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@@ -5,9 -5,10 +5,10 @@@
   *
   * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle
   */
 -#ifndef _ASM_FCNTL_H
 -#define _ASM_FCNTL_H
 +#ifndef _UAPI_ASM_FCNTL_H
 +#define _UAPI_ASM_FCNTL_H
  
+ #include <asm/sgidefs.h>
  
  #define O_APPEND	0x0008
  #define O_DSYNC		0x0010	/* used to be O_SYNC, see below */