Merge branch 'prima2/pinctrl' into next/pinctrl

* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally
This commit is contained in:
Arnd Bergmann 2012-07-04 16:54:54 +02:00
commit 8ee41a62a3

View file

@ -389,7 +389,7 @@ config ARCH_PRIMA2
bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
select CPU_V7
select NO_IOPORT
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARCH_REQUIRE_GPIOLIB
select GENERIC_CLOCKEVENTS
select CLKDEV_LOOKUP
select GENERIC_IRQ_CHIP