X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/546b5ed544503182a9b3e981bc11feebd6042b21..6749db4d0fb9858b6e856c54548ff60bd455b140:/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
index a6822fc14..8da25daa7 100644
--- a/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/960-backport_gpiolib_better_rmmod_infrastructure.patch
@@ -22,11 +22,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index d8db2f8..eb75d12 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
-@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct gpio_desc *desc)
+@@ -68,6 +68,9 @@ static void gpio_ensure_requested(struct
  	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
  		pr_warning("GPIO-%d autorequested\n", (int)(desc - gpio_desc));
  		desc_set_label(desc, "[auto]");
@@ -36,7 +34,7 @@ index d8db2f8..eb75d12 100644
  	}
  }
  
-@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -177,6 +180,9 @@ int gpio_request(unsigned gpio, const ch
  	if (desc->chip == NULL)
  		goto done;
  
@@ -46,7 +44,7 @@ index d8db2f8..eb75d12 100644
  	/* NOTE:  gpio_request() can be called in early boot,
  	 * before IRQs are enabled.
  	 */
-@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const char *label)
+@@ -184,8 +190,10 @@ int gpio_request(unsigned gpio, const ch
  	if (test_and_set_bit(FLAG_REQUESTED, &desc->flags) == 0) {
  		desc_set_label(desc, label ? : "?");
  		status = 0;
@@ -71,8 +69,6 @@ index d8db2f8..eb75d12 100644
  		WARN_ON(extra_checks);
  
  	spin_unlock_irqrestore(&gpio_lock, flags);
-diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
-index f29a502..7e77b6f 100644
 --- a/include/asm-generic/gpio.h
 +++ b/include/asm-generic/gpio.h
 @@ -17,6 +17,7 @@