diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 11:36:51 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 11:36:51 +0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /arch/blackfin/include/asm/nand.h | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
| download | linux-6396fc3b3ff3f6b942992b653a62df11dcef9bea.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'arch/blackfin/include/asm/nand.h')
| -rw-r--r-- | arch/blackfin/include/asm/nand.h | 3 |
1 files changed, 0 insertions, 3 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 */ |