remove ipset support from core, it is now provided by xtables-addons from the package...

[openwrt.git] / target / linux / pxa / patches-2.6.21 / 011-proc-gpio.patch

diff --git a/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch b/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
index 371a214..9085a48 100644 (file)
--- a/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
+++ b/target/linux/pxa/patches-2.6.21/011-proc-gpio.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.21gum/arch/arm/Kconfig
-===================================================================
---- linux-2.6.21gum.orig/arch/arm/Kconfig
-+++ linux-2.6.21gum/arch/arm/Kconfig
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
 @@ -505,6 +505,8 @@ config PCI_HOST_VIA82C505
        depends on PCI && ARCH_SHARK
        default y
@@ -11,20 +9,16 @@ Index: linux-2.6.21gum/arch/arm/Kconfig
  source "drivers/pci/Kconfig"
  
  source "drivers/pcmcia/Kconfig"
-Index: linux-2.6.21gum/drivers/Makefile
-===================================================================
---- linux-2.6.21gum.orig/drivers/Makefile
-+++ linux-2.6.21gum/drivers/Makefile
+--- a/drivers/Makefile
++++ b/drivers/Makefile
 @@ -81,3 +81,4 @@ obj-$(CONFIG_GENERIC_TIME)   += clocksourc
  obj-$(CONFIG_DMA_ENGINE)      += dma/
  obj-$(CONFIG_HID)             += hid/
  obj-$(CONFIG_PPC_PS3)         += ps3/
 +obj-$(CONFIG_PROC_GPIO)               += gpio/
-Index: linux-2.6.21gum/drivers/gpio/Kconfig
-===================================================================
 --- /dev/null
-+++ linux-2.6.21gum/drivers/gpio/Kconfig
-@@ -0,0 +1,12 @@
++++ b/drivers/gpio/Kconfig
+@@ -0,0 +1,13 @@
 +config PROC_GPIO
 +      tristate "GPIO /proc interface"
 +      depends on PXA25x || PXA27x
@@ -37,18 +31,14 @@ Index: linux-2.6.21gum/drivers/gpio/Kconfig
 +      depends on PROC_GPIO
 +      help
 +        This enables printk logging of activity done through /proc/gpio
-Index: linux-2.6.21gum/drivers/gpio/Makefile
-===================================================================
++
 --- /dev/null
-+++ linux-2.6.21gum/drivers/gpio/Makefile
-@@ -0,0 +1,3 @@
++++ b/drivers/gpio/Makefile
+@@ -0,0 +1,2 @@
 +# Expose GPIOs under /proc
-+obj-$(CONFIG_PROC_GPIO)                       += proc_gpio.o
-+
-Index: linux-2.6.21gum/drivers/gpio/proc_gpio.c
-===================================================================
++obj-$(CONFIG_PROC_GPIO)               += proc_gpio.o
 --- /dev/null
-+++ linux-2.6.21gum/drivers/gpio/proc_gpio.c
++++ b/drivers/gpio/proc_gpio.c
 @@ -0,0 +1,276 @@
 +/*
 + *