diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-03 03:42:39 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-03 03:42:39 -0400 |
| commit | c61daf6b0a2f7048c6e74d52b043fa6a779b128a (patch) | |
| tree | a4a38656ac79775f38ce5fd6b00dd9b89cd5ccec /arch/arm/mach-ixp4xx/nslu2-setup.c | |
| parent | 786c89f7a24b4ed8b68dfb136347267875315c30 (diff) | |
| parent | 160a84cfc975f4aaec1cb32a48bba23ccaf43761 (diff) | |
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-cleanup
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index f79b62eb7614..69e40f2cf092 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c | |||
| @@ -305,4 +305,7 @@ MACHINE_START(NSLU2, "Linksys NSLU2") | |||
| 305 | .init_irq = ixp4xx_init_irq, | 305 | .init_irq = ixp4xx_init_irq, |
| 306 | .timer = &nslu2_timer, | 306 | .timer = &nslu2_timer, |
| 307 | .init_machine = nslu2_init, | 307 | .init_machine = nslu2_init, |
| 308 | #if defined(CONFIG_PCI) | ||
| 309 | .dma_zone_size = SZ_64M, | ||
| 310 | #endif | ||
| 308 | MACHINE_END | 311 | MACHINE_END |