ar71xx: remove CONFIG_MTD_CONCAT ifdefs from the WZR-HP-AG300H code
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 30 Jun 2011 12:15:33 +0000 (12:15 +0000)
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 30 Jun 2011 12:15:33 +0000 (12:15 +0000)
The config option has been removed in 2.6.39.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27320 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c

index e752217..2509a27 100644 (file)
@@ -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(&not);
 }
 
-#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);
 }