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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp4xx
/
fsg-setup.c
diff --git
a/arch/arm/mach-ixp4xx/fsg-setup.c
b/arch/arm/mach-ixp4xx/fsg-setup.c
index
727ee39
..
23a8b36
100644
(file)
--- a/
arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/
arch/arm/mach-ixp4xx/fsg-setup.c
@@
-275,5
+275,8
@@
MACHINE_START(FSG, "Freecom FSG-3")
.timer = &ixp4xx_timer,
.boot_params = 0x0100,
.init_machine = fsg_init,
+#if defined(CONFIG_PCI)
+ .dma_zone_size = SZ_64M,
+#endif
MACHINE_END