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/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
gateway7001-setup.c
diff --git
a/arch/arm/mach-ixp4xx/gateway7001-setup.c
b/arch/arm/mach-ixp4xx/gateway7001-setup.c
index
d4f851b
..
d69d1b0
100644
(file)
--- a/
arch/arm/mach-ixp4xx/gateway7001-setup.c
+++ b/
arch/arm/mach-ixp4xx/gateway7001-setup.c
@@
-99,7
+99,7
@@
MACHINE_START(GATEWAY7001, "Gateway 7001 AP")
.map_io = ixp4xx_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer,
- .
boot_params = 0x0
100,
+ .
atag_offset = 0x
100,
.init_machine = gateway7001_init,
#if defined(CONFIG_PCI)
.dma_zone_size = SZ_64M,