diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-22 18:09:07 -0400 |
| commit | 3ad55155b222f2a901405dea20ff7c68828ecd92 (patch) | |
| tree | 53b24c981387b037084a333dc5ae23be8e82ef4a /arch/arm/mach-ixp4xx/nas100d-setup.c | |
| parent | 06f365acef5ca54fd5708a0d853c4a89609536f1 (diff) | |
| parent | 6645cb61f3a1186a71475385d33f875dd8fb38bf (diff) | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/entry-armv.S
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index f18fee748878..afb51879d9a4 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c | |||
| @@ -319,4 +319,7 @@ MACHINE_START(NAS100D, "Iomega NAS 100d") | |||
| 319 | .init_irq = ixp4xx_init_irq, | 319 | .init_irq = ixp4xx_init_irq, |
| 320 | .timer = &ixp4xx_timer, | 320 | .timer = &ixp4xx_timer, |
| 321 | .init_machine = nas100d_init, | 321 | .init_machine = nas100d_init, |
| 322 | #if defined(CONFIG_PCI) | ||
| 323 | .dma_zone_size = SZ_64M, | ||
| 324 | #endif | ||
| 322 | MACHINE_END | 325 | MACHINE_END |