adm5120: merge 3.3 patches

[openwrt.git] / target / linux / adm5120 / files / arch / mips / adm5120 / infineon / infineon.c

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/infineon/infineon.c b/target/linux/adm5120/files/arch/mips/adm5120/infineon/infineon.c
index b52edf0..5c441da 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/infineon/infineon.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/infineon/infineon.c
@@ -16,7 +16,6 @@
 #define EASY_CONFIG_OFFSET     0x10000
 #define EASY_CONFIG_SIZE       0x1000
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition easy_partitions[] = {
        {
                .name   = "admboot",
@@ -33,7 +32,6 @@ static struct mtd_partition easy_partitions[] = {
                .size   = MTDPART_SIZ_FULL,
        }
 };
-#endif /* CONFIG_MTD_PARTITIONS */
 
 static __init void easy_setup_mac(void)
 {
@@ -68,10 +66,8 @@ void __init easy_setup_pqfp(void)
        gpio_direction_output(ADM5120_GPIO_PIN3, 0);
        adm5120_flash0_data.switch_bank = switch_bank_gpio3;
 
-#ifdef CONFIG_MTD_PARTITIONS
        adm5120_flash0_data.nr_parts = ARRAY_SIZE(easy_partitions);
        adm5120_flash0_data.parts = easy_partitions;
-#endif /* CONFIG_MTD_PARTITIONS */
 
        adm5120_add_device_uart(0);
        adm5120_add_device_uart(1);
@@ -100,10 +96,8 @@ void __init easy_setup_bga(void)
        gpio_direction_output(ADM5120_GPIO_PIN5, 0);
        adm5120_flash0_data.switch_bank = switch_bank_gpio5;
 
-#ifdef CONFIG_MTD_PARTITIONS
        adm5120_flash0_data.nr_parts = ARRAY_SIZE(easy_partitions);
        adm5120_flash0_data.parts = easy_partitions;
-#endif /* CONFIG_MTD_PARTITIONS */
 
        adm5120_add_device_uart(0);
        adm5120_add_device_uart(1);