Merge branch 'setns'

[karo-tx-linux.git] / arch / arm / mach-gemini / board-wbd111.c

diff --git a/arch/arm/mach-gemini/board-wbd111.c b/arch/arm/mach-gemini/board-wbd111.c
index af7b68a6b2589385ae2996afb7f5da7645278608..88cc422ee444341f0cb813dd48e4acff54a33d16 100644 (file)
--- a/arch/arm/mach-gemini/board-wbd111.c
+++ b/arch/arm/mach-gemini/board-wbd111.c
@@ -84,7 +84,6 @@ static struct sys_timer wbd111_timer = {
        .init   = gemini_timer_init,
 };
 
-#ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wbd111_partitions[] = {
        {
                .name           = "RedBoot",
@@ -116,11 +115,7 @@ static struct mtd_partition wbd111_partitions[] = {
                .mask_flags     = MTD_WRITEABLE,
        }
 };
-#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)
-#else
-#define wbd111_partitions      NULL
-#define wbd111_num_partitions  0
-#endif /* CONFIG_MTD_PARTITIONS */
+#define wbd111_num_partitions  ARRAY_SIZE(wbd111_partitions)
 
 static void __init wbd111_init(void)
 {