mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-01 06:04:48 -04:00
mtd: s3c2410: remove CONFIG_MTD_PARTITIONS test
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>
This commit is contained in:
committed by
David Woodhouse
parent
3dfad123e8
commit
78352282f3
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user