git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/vga.support' into stable/drivers
[pandora-kernel.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
a15d062
..
43c2b83
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>
#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>
#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,
};
.resource = &tct_hammer_nor_resource,
};
-#endif
-
static struct map_desc tct_hammer_iodesc[] __initdata = {
};
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,
&s3c_device_rtc,
&s3c_device_usbgadget,
&s3c_device_sdi,
-#ifdef CONFIG_MTD_PARTITIONS
&tct_hammer_device_nor,
&tct_hammer_device_nor,
-#endif
};
static void __init tct_hammer_map_io(void)
};
static void __init tct_hammer_map_io(void)