diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
| commit | 1a43f2012455a977397deffe35912fd3f3ce17b9 (patch) | |
| tree | 5189f337df44e7a495fbd097cd476b0380babd8c /arch/arm/mach-ixp4xx/coyote-setup.c | |
| parent | e1b96ada659431669efaf3defa997abf5db68130 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/arm/mach-ixp4xx/coyote-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 355e3de38733..e24564b5d935 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
| @@ -114,6 +114,9 @@ MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") | |||
| 114 | .timer = &ixp4xx_timer, | 114 | .timer = &ixp4xx_timer, |
| 115 | .boot_params = 0x0100, | 115 | .boot_params = 0x0100, |
| 116 | .init_machine = coyote_init, | 116 | .init_machine = coyote_init, |
| 117 | #if defined(CONFIG_PCI) | ||
| 118 | .dma_zone_size = SZ_64M, | ||
| 119 | #endif | ||
| 117 | MACHINE_END | 120 | MACHINE_END |
| 118 | #endif | 121 | #endif |
| 119 | 122 | ||