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.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
mioa701.c
diff --git
a/arch/arm/mach-pxa/mioa701.c
b/arch/arm/mach-pxa/mioa701.c
index
dc66942
..
0c31fab
100644
(file)
--- a/
arch/arm/mach-pxa/mioa701.c
+++ b/
arch/arm/mach-pxa/mioa701.c
@@
-45,7
+45,7
@@
#include <mach/pxa27x.h>
#include <mach/regs-rtc.h>
#include <mach/pxa27x.h>
#include <mach/regs-rtc.h>
-#include <
mach
/pxa27x_keypad.h>
+#include <
plat
/pxa27x_keypad.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/udc.h>
@@
-819,8
+819,6
@@
static void mioa701_machine_exit(void)
}
MACHINE_START(MIOA701, "MIO A701")
}
MACHINE_START(MIOA701, "MIO A701")
- .phys_io = 0x40000000,
- .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.boot_params = 0xa0000100,
.map_io = &pxa_map_io,
.init_irq = &pxa27x_init_irq,
.boot_params = 0xa0000100,
.map_io = &pxa_map_io,
.init_irq = &pxa27x_init_irq,