ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH

A check for CONFIG_SX1_OLD_FLASH was added in v2.6.24. But the related
Kconfig symbol was never part of the tree. So we can remove some dead
code.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 0a8d334..29e5262 100644 (file)
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -266,31 +266,6 @@ static struct physmap_flash_data sx1_flash_data = {
        .nr_parts       = ARRAY_SIZE(sx1_partitions),
 };
 
-#ifdef CONFIG_SX1_OLD_FLASH
-/* MTD Intel StrataFlash - old flashes */
-static struct resource sx1_old_flash_resource[] = {
-       [0] = {
-               .start  = OMAP_CS0_PHYS,        /* Physical */
-               .end    = OMAP_CS0_PHYS + SZ_16M - 1,,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = OMAP_CS1_PHYS,
-               .end    = OMAP_CS1_PHYS + SZ_8M - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device sx1_flash_device = {
-       .name           = "physmap-flash",
-       .id             = 0,
-       .dev            = {
-               .platform_data  = &sx1_flash_data,
-       },
-       .num_resources  = 2,
-       .resource       = &sx1_old_flash_resource,
-};
-#else
 /* MTD Intel 4000 flash - new flashes */
 static struct resource sx1_new_flash_resource = {
        .start          = OMAP_CS0_PHYS,
@@ -307,7 +282,6 @@ static struct platform_device sx1_flash_device = {
        .num_resources  = 1,
        .resource       = &sx1_new_flash_resource,
 };
-#endif
 
 /*----------- USB -------------------------*/