mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test
authorJamie Iles <jamie@jamieiles.com>
Mon, 23 May 2011 09:22:51 +0000 (10:22 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Wed, 25 May 2011 01:20:52 +0000 (02:20 +0100)
MTD is now always build with partitioning support so this can be
removed.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
arch/arm/mach-s3c2410/mach-amlm5900.c
arch/arm/mach-s3c2410/mach-tct_hammer.c

index 44440cbd76204f7212d97f87228ae4d8394ae4b0..dabc141243f397b234c00b19293fccdd05a5d027 100644 (file)
@@ -58,8 +58,6 @@
 #include <plat/cpu.h>
 #include <plat/gpio-cfg.h>
 
-#ifdef CONFIG_MTD_PARTITIONS
-
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/map.h>
@@ -113,7 +111,6 @@ static struct platform_device amlm5900_device_nor = {
        .num_resources  = 1,
        .resource       = &amlm5900_nor_resource,
 };
-#endif
 
 static struct map_desc amlm5900_iodesc[] __initdata = {
 };
@@ -158,9 +155,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
        &s3c_device_rtc,
        &s3c_device_usbgadget,
         &s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
        &amlm5900_device_nor,
-#endif
 };
 
 static void __init amlm5900_map_io(void)
index a15d0621c22f2e4bbb4f7786d0435b575d3217ba..43c2b831b9e85164a5f9465216145e6973015f88 100644 (file)
@@ -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)