[kernel] update to 2.6.25.12

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.25 / 961-backport_gpio_define_gpio_valid.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
index 58e65efa7f3245b6ef559f421750928dd916ffb7..49f38081092dc2f152f6c03181c83980b9336102 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch
@@ -16,11 +16,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/Documentation/gpio.txt b/Documentation/gpio.txt
-index 5463009..c35ca9e 100644
 --- a/Documentation/gpio.txt
 +++ b/Documentation/gpio.txt
-@@ -107,6 +107,16 @@ type of GPIO controller, and on one particular board 80-95 with an FPGA.
+@@ -107,6 +107,16 @@
  The numbers need not be contiguous; either of those platforms could also
  use numbers 2000-2063 to identify GPIOs in a bank of I2C GPIO expanders.
  
@@ -37,11 +35,9 @@ index 5463009..c35ca9e 100644
  Whether a platform supports multiple GPIO controllers is currently a
  platform-specific implementation issue.
  
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index eb75d12..623fcd9 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -99,7 +99,7 @@ int gpiochip_add(struct gpio_chip *chip)
+@@ -99,7 +99,7 @@
         * dynamic allocation.  We don't currently support that.
         */
  
@@ -50,7 +46,7 @@ index eb75d12..623fcd9 100644
                status = -EINVAL;
                goto fail;
        }
-@@ -174,7 +174,7 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -174,7 +174,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -59,7 +55,7 @@ index eb75d12..623fcd9 100644
                goto done;
        desc = &gpio_desc[gpio];
        if (desc->chip == NULL)
-@@ -209,7 +209,7 @@ void gpio_free(unsigned gpio)
+@@ -209,7 +209,7 @@
        unsigned long           flags;
        struct gpio_desc        *desc;
  
@@ -68,7 +64,7 @@ index eb75d12..623fcd9 100644
                WARN_ON(extra_checks);
                return;
        }
-@@ -245,7 +245,7 @@ const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset)
+@@ -245,7 +245,7 @@
  {
        unsigned gpio = chip->base + offset;
  
@@ -77,7 +73,7 @@ index eb75d12..623fcd9 100644
                return NULL;
        if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0)
                return NULL;
-@@ -276,7 +276,7 @@ int gpio_direction_input(unsigned gpio)
+@@ -276,7 +276,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -86,7 +82,7 @@ index eb75d12..623fcd9 100644
                goto fail;
        chip = desc->chip;
        if (!chip || !chip->get || !chip->direction_input)
-@@ -314,7 +314,7 @@ int gpio_direction_output(unsigned gpio, int value)
+@@ -314,7 +314,7 @@
  
        spin_lock_irqsave(&gpio_lock, flags);
  
@@ -95,7 +91,7 @@ index eb75d12..623fcd9 100644
                goto fail;
        chip = desc->chip;
        if (!chip || !chip->set || !chip->direction_output)
-@@ -531,7 +531,7 @@ static int gpiolib_show(struct seq_file *s, void *unused)
+@@ -531,7 +531,7 @@
  
        /* REVISIT this isn't locked against gpio_chip removal ... */
  
@@ -104,8 +100,6 @@ index eb75d12..623fcd9 100644
                if (chip == gpio_desc[gpio].chip)
                        continue;
                chip = gpio_desc[gpio].chip;
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index 7e77b6f..464c5b3 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
 @@ -16,6 +16,12 @@
@@ -121,7 +115,7 @@ index 7e77b6f..464c5b3 100644
  struct seq_file;
  struct module;
  
-@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio);
+@@ -99,6 +105,16 @@
  
  #else