diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-ixp4xx/avila-setup.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ixp4xx/avila-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/avila-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c index ee19c1d383aa..37609a22c450 100644 --- a/arch/arm/mach-ixp4xx/avila-setup.c +++ b/arch/arm/mach-ixp4xx/avila-setup.c | |||
| @@ -167,7 +167,7 @@ MACHINE_START(AVILA, "Gateworks Avila Network Platform") | |||
| 167 | .map_io = ixp4xx_map_io, | 167 | .map_io = ixp4xx_map_io, |
| 168 | .init_irq = ixp4xx_init_irq, | 168 | .init_irq = ixp4xx_init_irq, |
| 169 | .timer = &ixp4xx_timer, | 169 | .timer = &ixp4xx_timer, |
| 170 | .boot_params = 0x0100, | 170 | .atag_offset = 0x100, |
| 171 | .init_machine = avila_init, | 171 | .init_machine = avila_init, |
| 172 | #if defined(CONFIG_PCI) | 172 | #if defined(CONFIG_PCI) |
| 173 | .dma_zone_size = SZ_64M, | 173 | .dma_zone_size = SZ_64M, |
| @@ -185,7 +185,7 @@ MACHINE_START(LOFT, "Giant Shoulder Inc Loft board") | |||
| 185 | .map_io = ixp4xx_map_io, | 185 | .map_io = ixp4xx_map_io, |
| 186 | .init_irq = ixp4xx_init_irq, | 186 | .init_irq = ixp4xx_init_irq, |
| 187 | .timer = &ixp4xx_timer, | 187 | .timer = &ixp4xx_timer, |
| 188 | .boot_params = 0x0100, | 188 | .atag_offset = 0x100, |
| 189 | .init_machine = avila_init, | 189 | .init_machine = avila_init, |
| 190 | #if defined(CONFIG_PCI) | 190 | #if defined(CONFIG_PCI) |
| 191 | .dma_zone_size = SZ_64M, | 191 | .dma_zone_size = SZ_64M, |