From 94b5af79b4051dceca40fedc440a3348ff987b3b Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 7 Nov 2008 08:44:56 +0000 Subject: [kernel] update to 2.6.25.19, and refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13137 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-2.6.25/963-backport_gpio_chip_reserve.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch') diff --git a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch b/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch index a4a243e8e..abf77c355 100644 --- a/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch +++ b/target/linux/generic-2.6/patches-2.6.25/963-backport_gpio_chip_reserve.patch @@ -21,7 +21,7 @@ Signed-off-by: Linus Torvalds --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -43,6 +43,7 @@ +@@ -43,6 +43,7 @@ struct gpio_desc { /* flag symbols are bit numbers */ #define FLAG_REQUESTED 0 #define FLAG_IS_OUT 1 @@ -29,7 +29,7 @@ Signed-off-by: Linus Torvalds #ifdef CONFIG_DEBUG_FS const char *label; -@@ -88,9 +89,10 @@ +@@ -88,9 +89,10 @@ static int gpiochip_find_base(int ngpio) int base = -ENOSPC; for (i = ARCH_NR_GPIOS - 1; i >= 0 ; i--) { @@ -42,7 +42,7 @@ Signed-off-by: Linus Torvalds spare++; if (spare == ngpio) { base = i; -@@ -98,7 +100,8 @@ +@@ -98,7 +100,8 @@ static int gpiochip_find_base(int ngpio) } } else { spare = 0; @@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds } } -@@ -108,6 +111,47 @@ +@@ -108,6 +111,47 @@ static int gpiochip_find_base(int ngpio) } /** @@ -102,7 +102,7 @@ Signed-off-by: Linus Torvalds * Context: potentially before irqs or kmalloc will work --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h -@@ -74,6 +74,7 @@ +@@ -74,6 +74,7 @@ struct gpio_chip { extern const char *gpiochip_is_requested(struct gpio_chip *chip, unsigned offset); -- cgit v1.2.3