aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/badge4.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 06:06:09 +0200
commit499ba610c2829adafbf393c2f3773d73ae4445f3 (patch)
treefae89854e0b3e704dd6410780e392901df1a6759 /arch/arm/mach-sa1100/badge4.c
parent817ba283acf2d7b5aa073b96fd989f336fcff72a (diff)
downloadkernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.zip
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.gz
kernel_samsung_smdk4412-499ba610c2829adafbf393c2f3773d73ae4445f3.tar.bz2
merge more graphics stuff from 3.2.72
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
-rw-r--r--arch/arm/mach-sa1100/badge4.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c
index 4f19ff8..bda83e1 100644
--- a/arch/arm/mach-sa1100/badge4.c
+++ b/arch/arm/mach-sa1100/badge4.c
@@ -302,8 +302,11 @@ static void __init badge4_map_io(void)
}
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
- .boot_params = 0xc0000100,
+ .atag_offset = 0x100,
.map_io = badge4_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
+#ifdef CONFIG_SA1111
+ .dma_zone_size = SZ_1M,
+#endif
MACHINE_END