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 git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
palmtx.c
diff --git
a/arch/arm/mach-pxa/palmtx.c
b/arch/arm/mach-pxa/palmtx.c
index
144dc2b
..
d2060a1
100644
(file)
--- a/
arch/arm/mach-pxa/palmtx.c
+++ b/
arch/arm/mach-pxa/palmtx.c
@@
-43,7
+43,7
@@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
-#include <
mach
/pxa27x_keypad.h>
+#include <
plat
/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
#include <mach/udc.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
@@
-363,8
+363,6
@@
static void __init palmtx_init(void)
}
MACHINE_START(PALMTX, "Palm T|X")
}
MACHINE_START(PALMTX, "Palm T|X")
- .phys_io = PALMTX_PHYS_IO_START,
- .io_pg_offst = io_p2v(0x40000000),
.boot_params = 0xa0000100,
.map_io = palmtx_map_io,
.init_irq = pxa27x_init_irq,
.boot_params = 0xa0000100,
.map_io = palmtx_map_io,
.init_irq = pxa27x_init_irq,