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
This commit is contained in:
Gabor Juhos 2011-06-30 12:15:33 +00:00
parent 8f0fb81dfe
commit f9e4619b97

View file

@ -28,8 +28,6 @@
#define WZRHPAG300H_KEYS_POLL_INTERVAL 20 /* msecs */ #define WZRHPAG300H_KEYS_POLL_INTERVAL 20 /* msecs */
#define WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPAG300H_KEYS_POLL_INTERVAL) #define WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL (3 * WZRHPAG300H_KEYS_POLL_INTERVAL)
#ifdef CONFIG_MTD_CONCAT
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition wzrhpag300h_flash_partitions[] = { static struct mtd_partition wzrhpag300h_flash_partitions[] = {
{ {
@ -122,8 +120,6 @@ static void add_mtd_concat_notifier(void)
register_mtd_user(&not); register_mtd_user(&not);
} }
#endif
static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = { static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = {
{ {
.name = "wzr-hp-ag300h:red:diag", .name = "wzr-hp-ag300h:red:diag",
@ -222,9 +218,7 @@ static void __init wzrhpag300h_setup(void)
ar71xx_add_device_spi(NULL, ar71xx_spi_info, ar71xx_add_device_spi(NULL, ar71xx_spi_info,
ARRAY_SIZE(ar71xx_spi_info)); ARRAY_SIZE(ar71xx_spi_info));
#ifdef CONFIG_MTD_CONCAT
add_mtd_concat_notifier(); add_mtd_concat_notifier();
#endif
ap94_pci_init(eeprom1, mac1, eeprom2, mac2); ap94_pci_init(eeprom1, mac1, eeprom2, mac2);
} }