diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:32:18 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-11 02:33:14 -0500 |
| commit | f19693a17c6705e197eb24d4618060eaac1b535c (patch) | |
| tree | fc39dc23297c0e6be730cb0dfd74a34d9c0b8bfd /arch/arm/mach-shmobile/Kconfig | |
| parent | 23b120cdfae4f5c29da69de750d545bad719ead4 (diff) | |
| parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
Merge commit 'v2.6.38-rc4' into imx-for-2.6.39
Conflicts:
arch/arm/mach-mxs/clock-mx28.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 4d1b4c5c9389..0c8f6cf3e948 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -60,6 +60,8 @@ endchoice | |||
| 60 | 60 | ||
| 61 | config MACH_AG5EVM | 61 | config MACH_AG5EVM |
| 62 | bool "AG5EVM board" | 62 | bool "AG5EVM board" |
| 63 | select ARCH_REQUIRE_GPIOLIB | ||
| 64 | select SH_LCD_MIPI_DSI | ||
| 63 | depends on ARCH_SH73A0 | 65 | depends on ARCH_SH73A0 |
| 64 | 66 | ||
| 65 | config MACH_MACKEREL | 67 | config MACH_MACKEREL |