diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 04:49:47 -0500 |
| commit | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (patch) | |
| tree | 3f3b8ec46d57bcb61a2d794a1f21bd4df01728c9 /arch/arm/mach-omap2/omap4-common.c | |
| parent | e879c862fb81b986095ae7a4676b2281c2f97957 (diff) | |
| parent | 3f1517a761905c55d1db71cb0afd359d74a76a6c (diff) | |
Merge branch 'restart-cleanup' into restart
Diffstat (limited to 'arch/arm/mach-omap2/omap4-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index 35ac3e5f6e94..f327d7472ca7 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
| @@ -22,7 +22,8 @@ | |||
| 22 | #include <plat/irqs.h> | 22 | #include <plat/irqs.h> |
| 23 | 23 | ||
| 24 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 25 | #include <mach/omap4-common.h> | 25 | |
| 26 | #include "common.h" | ||
| 26 | 27 | ||
| 27 | #ifdef CONFIG_CACHE_L2X0 | 28 | #ifdef CONFIG_CACHE_L2X0 |
| 28 | void __iomem *l2cache_base; | 29 | void __iomem *l2cache_base; |