make ixp4xx require gpiolib

SVN-Revision: 14262

diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index b22a3ccc548dd49f810acc59ca498a9f2d2b8ed1..374d1b159b4219ab0c5a56932b143862c1e31b5f 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@@ -125,7 +125,6 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y
 # CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
 CONFIG_HAVE_FTRACE=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_HAVE_GPIO_LIB=y
 CONFIG_HAVE_IDE=y
 # CONFIG_HAVE_IOREMAP_PROT is not set
 CONFIG_HAVE_KPROBES=y

diff --git a/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
index f59e097cc2e78a2855d95109d32e499b69956116..b9b73057fd233add3ddea956d461ab96f4fc607f 100644 (file)
--- a/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
+++ b/target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch
@@ -54,20 +54,10 @@
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
-+      select ARCH_WANT_OPTIONAL_GPIOLIB
++      select ARCH_REQUIRE_GPIOLIB
        select DMABOUNCE if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
---- a/arch/arm/mach-ixp4xx/Kconfig
-+++ b/arch/arm/mach-ixp4xx/Kconfig
-@@ -28,6 +28,7 @@ config MACH_AVILA
- config MACH_CAMBRIA
-       bool "Cambria"
-       select PCI
-+      select GPIOLIB
-       help
-         Say 'Y' here if you want your kernel to support the Gateworks
-         Cambria series. For more information on this platform,
 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
 +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h
 @@ -27,47 +27,31 @@