From f9e4619b97c6db6d4003cc3475ad3cc285d10367 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 30 Jun 2011 12:15:33 +0000 Subject: [PATCH] ar71xx: remove CONFIG_MTD_CONCAT ifdefs from the WZR-HP-AG300H code The config option has been removed in 2.6.39. SVN-Revision: 27320 --- .../ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c index e75221749a..2509a27568 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c @@ -28,8 +28,6 @@ #define WZRHPAG300H_KEYS_POLL_INTERVAL 20 /* msecs */ #define WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPAG300H_KEYS_POLL_INTERVAL) -#ifdef CONFIG_MTD_CONCAT - #ifdef CONFIG_MTD_PARTITIONS static struct mtd_partition wzrhpag300h_flash_partitions[] = { { @@ -122,8 +120,6 @@ static void add_mtd_concat_notifier(void) register_mtd_user(¬); } -#endif - static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = { { .name = "wzr-hp-ag300h:red:diag", @@ -222,9 +218,7 @@ static void __init wzrhpag300h_setup(void) ar71xx_add_device_spi(NULL, ar71xx_spi_info, ARRAY_SIZE(ar71xx_spi_info)); -#ifdef CONFIG_MTD_CONCAT add_mtd_concat_notifier(); -#endif ap94_pci_init(eeprom1, mac1, eeprom2, mac2); }