diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-05-15 21:41:42 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-16 14:12:05 -0700 |
| commit | 4906cc73c2e55217d71bd9e4b79708d6b41eaef4 (patch) | |
| tree | 3b62712c43dd5990176fe55b38b4e8d58cef3238 /arch/arm/mach-omap1 | |
| parent | 7d684ff8a9d0a12ce2a62a5842e3b01f686bac85 (diff) | |
| download | op-kernel-dev-4906cc73c2e55217d71bd9e4b79708d6b41eaef4.zip op-kernel-dev-4906cc73c2e55217d71bd9e4b79708d6b41eaef4.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 0a8d334..29e5262 100644 --- 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 -------------------------*/ |
