Merge branch 'setns'

[karo-tx-linux.git] / arch / mips / txx9 / generic / setup.c

diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 812816c456620f86fce6ba670d2f6352df7f9b6d..ec38e00b25592dccd0cbf51f7ed3ec3c10584e12 100644 (file)
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -639,7 +639,6 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                .flags = IORESOURCE_MEM,
        };
        struct platform_device *pdev;
-#ifdef CONFIG_MTD_PARTITIONS
        static struct mtd_partition parts[2];
        struct physmap_flash_data pdata_part;
 
@@ -658,7 +657,7 @@ void __init txx9_physmap_flash_init(int no, unsigned long addr,
                pdata_part.parts = parts;
                pdata = &pdata_part;
        }
-#endif
+
        pdev = platform_device_alloc("physmap-flash", no);
        if (!pdev ||
            platform_device_add_resources(pdev, &res, 1) ||