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 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
palmtreo.c
diff --git
a/arch/arm/mach-pxa/palmtreo.c
b/arch/arm/mach-pxa/palmtreo.c
index
52defd5
..
00e2d7b
100644
(file)
--- a/
arch/arm/mach-pxa/palmtreo.c
+++ b/
arch/arm/mach-pxa/palmtreo.c
@@
-39,7
+39,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/ohci.h>
#include <mach/pxa2xx-regs.h>
#include <mach/udc.h>
#include <mach/ohci.h>
#include <mach/pxa2xx-regs.h>
@@
-441,8
+441,6
@@
static void __init centro_init(void)
}
MACHINE_START(TREO680, "Palm Treo 680")
}
MACHINE_START(TREO680, "Palm Treo 680")
- .phys_io = TREO_PHYS_IO_START,
- .io_pg_offst = io_p2v(0x40000000),
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
.reserve = treo_reserve,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
.reserve = treo_reserve,
@@
-452,8
+450,6
@@
MACHINE_START(TREO680, "Palm Treo 680")
MACHINE_END
MACHINE_START(CENTRO, "Palm Centro 685")
MACHINE_END
MACHINE_START(CENTRO, "Palm Centro 685")
- .phys_io = TREO_PHYS_IO_START,
- .io_pg_offst = io_p2v(0x40000000),
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
.reserve = treo_reserve,
.boot_params = 0xa0000100,
.map_io = pxa_map_io,
.reserve = treo_reserve,