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-realview/realview_pb11mp.c | |
| parent | e1b96ada659431669efaf3defa997abf5db68130 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/arm/mach-realview/realview_pb11mp.c')
| -rw-r--r-- | arch/arm/mach-realview/realview_pb11mp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c index b2985fc7cd4e..b43644b3685e 100644 --- a/arch/arm/mach-realview/realview_pb11mp.c +++ b/arch/arm/mach-realview/realview_pb11mp.c | |||
| @@ -367,4 +367,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore") | |||
| 367 | .init_irq = gic_init_irq, | 367 | .init_irq = gic_init_irq, |
| 368 | .timer = &realview_pb11mp_timer, | 368 | .timer = &realview_pb11mp_timer, |
| 369 | .init_machine = realview_pb11mp_init, | 369 | .init_machine = realview_pb11mp_init, |
| 370 | #ifdef CONFIG_ZONE_DMA | ||
| 371 | .dma_zone_size = SZ_256M, | ||
| 372 | #endif | ||
| 370 | MACHINE_END | 373 | MACHINE_END |