Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / arch / blackfin / include / asm / nand.h

diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h
index 3a1e79d..256c50d 100644 (file)
--- 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 */