diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:36:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:36:53 -0400 |
| commit | e81218f5f0fd219bd75768d845159ba4810bdd48 (patch) | |
| tree | 0694d25e9601dab913644ed8a1a7734387e08e7c /arch/arm/Kconfig | |
| parent | 3645f0cd96fbf72c614673c5f4b1a8675f82a379 (diff) | |
| parent | 8ee41a62a3800b8450985d2970fd985421ad7043 (diff) | |
Merge tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc pincontrol drivers update from Arnd Bergmann:
"We are converting platforms to use the pinctrl framework over time,
rather than using platform specific code for the same effect. This
adds the respective driver for the prima2 platform."
* tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: prima2: enable gpiolib unconditionally
PINCTRL: SiRF: add GPIO and GPIO irq support in CSR SiRFprimaII
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7658d19bb111..c7e6d208fa8d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -412,6 +412,7 @@ config ARCH_PRIMA2 | |||
| 412 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" | 412 | bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform" |
| 413 | select CPU_V7 | 413 | select CPU_V7 |
| 414 | select NO_IOPORT | 414 | select NO_IOPORT |
| 415 | select ARCH_REQUIRE_GPIOLIB | ||
| 415 | select GENERIC_CLOCKEVENTS | 416 | select GENERIC_CLOCKEVENTS |
| 416 | select CLKDEV_LOOKUP | 417 | select CLKDEV_LOOKUP |
| 417 | select GENERIC_IRQ_CHIP | 418 | select GENERIC_IRQ_CHIP |