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 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
assabet.c
diff --git
a/arch/arm/mach-sa1100/assabet.c
b/arch/arm/mach-sa1100/assabet.c
index
5778274
..
26257df
100644
(file)
--- a/
arch/arm/mach-sa1100/assabet.c
+++ b/
arch/arm/mach-sa1100/assabet.c
@@
-453,4
+453,7
@@
MACHINE_START(ASSABET, "Intel-Assabet")
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = assabet_init,
+#ifdef CONFIG_SA1111
+ .dma_zone_size = SZ_1M,
+#endif
MACHINE_END