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 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[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
9dc0b4e
..
d4f851b
100644
(file)
--- a/
arch/arm/mach-ixp4xx/gateway7001-setup.c
+++ b/
arch/arm/mach-ixp4xx/gateway7001-setup.c
@@
-101,5
+101,8
@@
MACHINE_START(GATEWAY7001, "Gateway 7001 AP")
.timer = &ixp4xx_timer,
.boot_params = 0x0100,
.init_machine = gateway7001_init,
.timer = &ixp4xx_timer,
.boot_params = 0x0100,
.init_machine = gateway7001_init,
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
MACHINE_END
#endif
MACHINE_END
#endif