Merge branch 'master' into for-next

Conflicts:
	fs/exofs/inode.c

2 files changed, 0 insertions, 5 deletions

diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h
index 3a1e79dfc8d9..256c50d8d465 100644
--- a/arch/blackfin/include/asm/nand.h
+++ b/arch/blackfin/include/asm/nand.h
@@ -15,8 +15,6 @@
  * partitions    = mtd partition list
  */
 
-#define NFC_PG_SIZE_256         0
-#define NFC_PG_SIZE_512         1
 #define NFC_PG_SIZE_OFFSET      9
 
 #define NFC_NWIDTH_8            0
@@ -30,7 +28,6 @@
 
 struct bf5xx_nand_platform {
         /* NAND chip information */
-        unsigned short          page_size;
         unsigned short          data_width;
 
         /* RD/WR strobe delay timing information, all times in SCLK cycles */
diff --git a/arch/blackfin/include/asm/scatterlist.h b/arch/blackfin/include/asm/scatterlist.h
index 64d41d34ab0b..d177a1588958 100644
--- a/arch/blackfin/include/asm/scatterlist.h
+++ b/arch/blackfin/include/asm/scatterlist.h
@@ -3,6 +3,4 @@
 
 #include <asm-generic/scatterlist.h>
 
-#define ISA_DMA_THRESHOLD       (0xffffffff)
-
 #endif                          /* !(_BLACKFIN_SCATTERLIST_H) */