diff options
Diffstat (limited to 'arch/blackfin/mach-bf537/boards/stamp.c')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index e16dc4560048..76db1d483173 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -382,7 +382,6 @@ static struct platform_device net2272_bfin_device = { | |||
382 | #endif | 382 | #endif |
383 | 383 | ||
384 | #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE) | 384 | #if defined(CONFIG_MTD_NAND_PLATFORM) || defined(CONFIG_MTD_NAND_PLATFORM_MODULE) |
385 | #ifdef CONFIG_MTD_PARTITIONS | ||
386 | const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; | 385 | const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; |
387 | 386 | ||
388 | static struct mtd_partition bfin_plat_nand_partitions[] = { | 387 | static struct mtd_partition bfin_plat_nand_partitions[] = { |
@@ -396,7 +395,6 @@ static struct mtd_partition bfin_plat_nand_partitions[] = { | |||
396 | .offset = MTDPART_OFS_APPEND, | 395 | .offset = MTDPART_OFS_APPEND, |
397 | }, | 396 | }, |
398 | }; | 397 | }; |
399 | #endif | ||
400 | 398 | ||
401 | #define BFIN_NAND_PLAT_CLE 2 | 399 | #define BFIN_NAND_PLAT_CLE 2 |
402 | #define BFIN_NAND_PLAT_ALE 1 | 400 | #define BFIN_NAND_PLAT_ALE 1 |
@@ -423,11 +421,9 @@ static struct platform_nand_data bfin_plat_nand_data = { | |||
423 | .chip = { | 421 | .chip = { |
424 | .nr_chips = 1, | 422 | .nr_chips = 1, |
425 | .chip_delay = 30, | 423 | .chip_delay = 30, |
426 | #ifdef CONFIG_MTD_PARTITIONS | ||
427 | .part_probe_types = part_probes, | 424 | .part_probe_types = part_probes, |
428 | .partitions = bfin_plat_nand_partitions, | 425 | .partitions = bfin_plat_nand_partitions, |
429 | .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions), | 426 | .nr_partitions = ARRAY_SIZE(bfin_plat_nand_partitions), |
430 | #endif | ||
431 | }, | 427 | }, |
432 | .ctrl = { | 428 | .ctrl = { |
433 | .cmd_ctrl = bfin_plat_nand_cmd_ctrl, | 429 | .cmd_ctrl = bfin_plat_nand_cmd_ctrl, |