Merge branch 'setns'

[karo-tx-linux.git] / arch / arm / mach-s3c2410 / mach-tct_hammer.c

diff --git a/arch/arm/mach-s3c2410/mach-tct_hammer.c b/arch/arm/mach-s3c2410/mach-tct_hammer.c
index a15d0621c22f2e4bbb4f7786d0435b575d3217ba..43c2b831b9e85164a5f9465216145e6973015f88 100644 (file)
--- a/arch/arm/mach-s3c2410/mach-tct_hammer.c
+++ b/arch/arm/mach-s3c2410/mach-tct_hammer.c
@@ -49,8 +49,6 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -91,8 +89,6 @@ static struct platform_device tct_hammer_device_nor = {
        .resource       = &tct_hammer_nor_resource,
 };
 
-#endif
-
 static struct map_desc tct_hammer_iodesc[] __initdata = {
 };
 
@@ -133,9 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
        &s3c_device_rtc,
        &s3c_device_usbgadget,
        &s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
        &tct_hammer_device_nor,
-#endif
 };
 
 static void __init tct_hammer_map_io(void)