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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
s3c2410.c
diff --git
a/arch/arm/mach-s3c2410/s3c2410.c
b/arch/arm/mach-s3c2410/s3c2410.c
index
1a86a98
..
e580303
100644
(file)
--- a/
arch/arm/mach-s3c2410/s3c2410.c
+++ b/
arch/arm/mach-s3c2410/s3c2410.c
@@
-29,7
+29,7
@@
#include <asm/irq.h>
#include <asm/arch/regs-clock.h>
#include <asm/irq.h>
#include <asm/arch/regs-clock.h>
-#include <asm/
arch
/regs-serial.h>
+#include <asm/
plat-s3c
/regs-serial.h>
#include <asm/plat-s3c24xx/s3c2410.h>
#include <asm/plat-s3c24xx/cpu.h>
#include <asm/plat-s3c24xx/s3c2410.h>
#include <asm/plat-s3c24xx/cpu.h>
@@
-40,7
+40,6
@@
static struct map_desc s3c2410_iodesc[] __initdata = {
IODESC_ENT(CLKPWR),
static struct map_desc s3c2410_iodesc[] __initdata = {
IODESC_ENT(CLKPWR),
- IODESC_ENT(LCD),
IODESC_ENT(TIMER),
IODESC_ENT(WATCHDOG),
};
IODESC_ENT(TIMER),
IODESC_ENT(WATCHDOG),
};