merge missing updates to squashfs lzma support from 2.6.30 to 2.6.31

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.28 / 924-cs5535_gpio.patch

diff --git a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
index 94b9e21..453affe 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/924-cs5535_gpio.patch
@@ -1,5 +1,5 @@
---- ../../cs5535_gpio.c.orig   2009-01-07 10:16:12.000000000 +0100
-+++ linux-2.6.28/drivers/char/cs5535_gpio.c    2009-01-07 10:13:54.000000000 +0100
+--- a/drivers/char/cs5535_gpio.c
++++ b/drivers/char/cs5535_gpio.c
 @@ -15,6 +15,7 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
@@ -8,7 +8,7 @@
  #include <linux/ioport.h>
  #include <linux/pci.h>
  #include <linux/smp_lock.h>
-@@ -48,6 +49,7 @@
+@@ -48,6 +49,7 @@ static struct pci_device_id divil_pci[] 
  MODULE_DEVICE_TABLE(pci, divil_pci);
  
  static struct cdev cs5535_gpio_cdev;
@@ -16,7 +16,7 @@
  
  /* reserve 32 entries even though some aren't usable */
  #define CS5535_GPIO_COUNT     32
-@@ -66,9 +68,14 @@
+@@ -66,9 +68,14 @@ static struct gpio_regmap rm[] =
        { 0x30, 0x00, '1', '0' },       /* GPIOx_READ_BACK / GPIOx_OUT_VAL */
        { 0x20, 0x20, 'I', 'i' },       /* GPIOx_IN_EN */
        { 0x04, 0x04, 'O', 'o' },       /* GPIOx_OUT_EN */
@@ -31,7 +31,7 @@
  };
  
  
-@@ -177,7 +184,7 @@
+@@ -177,7 +184,7 @@ static int __init cs5535_gpio_init(void)
  {
        dev_t   dev_id;
        u32     low, hi;
@@ -40,7 +40,7 @@
  
        if (pci_dev_present(divil_pci) == 0) {
                printk(KERN_WARNING NAME ": DIVIL not found\n");
-@@ -232,23 +239,54 @@
+@@ -232,23 +239,54 @@ static int __init cs5535_gpio_init(void)
                major = MAJOR(dev_id);
        }