Skip to content

Commit

Permalink
Merge branch 'prima2/pinctrl' into next/pinctrl
Browse files Browse the repository at this point in the history 
* prima2/pinctrl:
  ARM: prima2: enable gpiolib unconditionally
  • Loading branch information
Arnd Bergmann committed Jul 4, 2012
2 parents c911a31 + f638709 commit 8ee41a6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/arm/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8ee41a6

Please sign in to comment.