[ar7] resync kernel configuration

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 420-gpiodev.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
index ea7c244..de8b57a 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
@@ -1,7 +1,6 @@
-diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconfig
---- linux-2.6.25/drivers/char/Kconfig  2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25-owrt/drivers/char/Kconfig     2008-05-30 11:58:39.000000000 +0200
-@@ -955,6 +955,13 @@
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -955,6 +955,13 @@ config CS5535_GPIO
  
          If compiled as a module, it will be called cs5535_gpio.
  
@@ -15,10 +14,9 @@ diff -Nur linux-2.6.25/drivers/char/Kconfig linux-2.6.25-owrt/drivers/char/Kconf
  config GPIO_VR41XX
        tristate "NEC VR4100 series General-purpose I/O Unit support"
        depends on CPU_VR41XX
-diff -Nur linux-2.6.25/drivers/char/Makefile linux-2.6.25-owrt/drivers/char/Makefile
---- linux-2.6.25/drivers/char/Makefile 2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25-owrt/drivers/char/Makefile    2008-05-30 11:57:33.000000000 +0200
-@@ -94,6 +94,7 @@
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
+@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO)    += scx200_gpio
  obj-$(CONFIG_PC8736x_GPIO)    += pc8736x_gpio.o
  obj-$(CONFIG_NSC_GPIO)                += nsc_gpio.o
  obj-$(CONFIG_CS5535_GPIO)     += cs5535_gpio.o