diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 14:24:49 -0700 |
| commit | 303fd2c2ce5addef1aacac962a5b099cc0af71ea (patch) | |
| tree | a20d906caec25a068742d6d9998baf79e5c72677 /arch/blackfin/mach-bf548/boards/cm_bf548.c | |
| parent | 6b3a7c0f8a030561cb4eb5e905149938575e8085 (diff) | |
| parent | 9e5610a99535723e83b7ddd02f0fd3fe36c86649 (diff) | |
| download | linux-3.10-303fd2c2ce5addef1aacac962a5b099cc0af71ea.tar.gz linux-3.10-303fd2c2ce5addef1aacac962a5b099cc0af71ea.tar.bz2 linux-3.10-303fd2c2ce5addef1aacac962a5b099cc0af71ea.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin:
Blackfin: bf52x/bf54x boards: drop unused nand page size
Blackfin: punt duplicate SPORT MMR defines
Diffstat (limited to 'arch/blackfin/mach-bf548/boards/cm_bf548.c')
| -rw-r--r-- | arch/blackfin/mach-bf548/boards/cm_bf548.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf548/boards/cm_bf548.c b/arch/blackfin/mach-bf548/boards/cm_bf548.c index dbb6b1d83f6..0c38eec9ade 100644 --- a/arch/blackfin/mach-bf548/boards/cm_bf548.c +++ b/arch/blackfin/mach-bf548/boards/cm_bf548.c @@ -706,7 +706,6 @@ static struct mtd_partition partition_info[] = { }; static struct bf5xx_nand_platform bf5xx_nand_platform = { - .page_size = NFC_PG_SIZE_256, .data_width = NFC_NWIDTH_8, .partitions = partition_info, .nr_partitions = ARRAY_SIZE(partition_info), |