aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-01-29 14:39:56 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-01-29 14:39:56 +0000
commitd269d51004554427a21836be4ab94a0c88130d1e (patch)
tree297a5ea32be5e3651b37a52dee3aed5ae015b4d6 /target/linux/ixp4xx
parent1a680734c270e2b67cf40fb7d62688b8a5262732 (diff)
downloadupstream-d269d51004554427a21836be4ab94a0c88130d1e.tar.gz
upstream-d269d51004554427a21836be4ab94a0c88130d1e.tar.bz2
upstream-d269d51004554427a21836be4ab94a0c88130d1e.zip
make ixp4xx require gpiolib
SVN-Revision: 14262
Diffstat (limited to 'target/linux/ixp4xx')
-rw-r--r--target/linux/ixp4xx/config-2.6.281
-rw-r--r--target/linux/ixp4xx/patches-2.6.28/402-ixp4xx_gpiolib.patch12
2 files changed, 1 insertions, 12 deletions
diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index b22a3ccc54..374d1b159b 100644
--- 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 f59e097cc2..b9b73057fd 100644
--- 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 @@