diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 10:54:54 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 10:54:54 -0400 |
| commit | 8ee41a62a3800b8450985d2970fd985421ad7043 (patch) | |
| tree | 971c4f8cdd3e5f6f93f46fbcddd37a736f706c78 | |
| parent | c911a3169ed81bbda023740b76457aa795a4f910 (diff) | |
| parent | f63870924f83ebb66b5eb8fb8dde83bf9be252cc (diff) | |
Merge branch 'prima2/pinctrl' into next/pinctrl
* prima2/pinctrl:
ARM: prima2: enable gpiolib unconditionally
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 571b3d25c9bc..a851307f8755 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -389,7 +389,7 @@ config ARCH_PRIMA2 | |||
| 389 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" | 389 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" |
| 390 | select CPU_V7 | 390 | select CPU_V7 |
| 391 | select NO_IOPORT | 391 | select NO_IOPORT |
| 392 | select ARCH_WANT_OPTIONAL_GPIOLIB | 392 | select ARCH_REQUIRE_GPIOLIB |
| 393 | select GENERIC_CLOCKEVENTS | 393 | select GENERIC_CLOCKEVENTS |
| 394 | select CLKDEV_LOOKUP | 394 | select CLKDEV_LOOKUP |
| 395 | select GENERIC_IRQ_CHIP | 395 | select GENERIC_IRQ_CHIP |