Merge branch 'prima2/pinctrl' into next/pinctrl

* prima2/pinctrl: ARM: prima2: enable gpiolib unconditionally

Merge branch 'prima2/pinctrl' into next/pinctrl
* prima2/pinctrl: ARM: prima2: enable gpiolib unconditionally
8ee41a62 · Arnd Bergmann · c911a316 · f6387092 · 8ee41a62
Commit 8ee41a62 authored Jul 04, 2012 by Arnd Bergmann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/Kconfig arch/arm/Kconfig +1 -1

No files found.
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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