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/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
badge4.c
diff --git
a/arch/arm/mach-sa1100/badge4.c
b/arch/arm/mach-sa1100/badge4.c
index
4f19ff8
..
b4311b0
100644
(file)
--- a/
arch/arm/mach-sa1100/badge4.c
+++ b/
arch/arm/mach-sa1100/badge4.c
@@
-306,4
+306,7
@@
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
.map_io = badge4_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.map_io = badge4_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
+#ifdef CONFIG_SA1111
+ .dma_zone_size = SZ_1M,
+#endif
MACHINE_END
MACHINE_END