diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-shmobile/board-g3evm.c | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/mach-shmobile/board-g3evm.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-g3evm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c index 72d557281b1..6dbdc428c24 100644 --- a/arch/arm/mach-shmobile/board-g3evm.c +++ b/arch/arm/mach-shmobile/board-g3evm.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/input.h> | 33 | #include <linux/input.h> |
| 34 | #include <linux/input/sh_keysc.h> | 34 | #include <linux/input/sh_keysc.h> |
| 35 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 36 | #include <mach/irqs.h> | ||
| 36 | #include <mach/sh7367.h> | 37 | #include <mach/sh7367.h> |
| 37 | #include <mach/common.h> | 38 | #include <mach/common.h> |
| 38 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |