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/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x300.c
diff --git
a/arch/arm/mach-pxa/cm-x300.c
b/arch/arm/mach-pxa/cm-x300.c
index
8e0b562
..
922b107
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x300.c
+++ b/
arch/arm/mach-pxa/cm-x300.c
@@
-856,9
+856,7
@@
static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,
}
MACHINE_START(CM_X300, "CM-X300 module")
- .phys_io = 0x40000000,
.boot_params = 0xa0000100,
- .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
.map_io = pxa_map_io,
.init_irq = pxa3xx_init_irq,
.timer = &pxa_timer,