diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /arch/sh/boards/mach-rsk | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'arch/sh/boards/mach-rsk')
| -rw-r--r-- | arch/sh/boards/mach-rsk/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-rsk/Kconfig b/arch/sh/boards/mach-rsk/Kconfig index bff095dffc02..aeff3b042205 100644 --- a/arch/sh/boards/mach-rsk/Kconfig +++ b/arch/sh/boards/mach-rsk/Kconfig | |||
| @@ -10,7 +10,7 @@ config SH_RSK7201 | |||
| 10 | 10 | ||
| 11 | config SH_RSK7203 | 11 | config SH_RSK7203 |
| 12 | bool "RSK7203" | 12 | bool "RSK7203" |
| 13 | select GENERIC_GPIO | 13 | select ARCH_REQUIRE_GPIOLIB |
| 14 | depends on CPU_SUBTYPE_SH7203 | 14 | depends on CPU_SUBTYPE_SH7203 |
| 15 | 15 | ||
| 16 | endchoice | 16 | endchoice |