diff options
author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
---|---|---|
committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
commit | f21c103e5a69f7e6c18fc33fc6da1940f2307c60 (patch) | |
tree | af668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch | |
parent | 1efef1fe09658b5ec0aff95075b72f542416bf7e (diff) |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch b/target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch index 7839327e3..670b22449 100644 --- a/target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch +++ b/target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch @@ -1,8 +1,6 @@ -Index: linux-3.1.10/drivers/gpio/gpiolib.c -=================================================================== ---- linux-3.1.10.orig/drivers/gpio/gpiolib.c 2012-01-18 16:33:18.000000000 +0100 -+++ linux-3.1.10/drivers/gpio/gpiolib.c 2012-02-03 20:22:42.554529747 +0100 -@@ -64,9 +64,9 @@ +--- a/drivers/gpio/gpiolib.c ++++ b/drivers/gpio/gpiolib.c +@@ -64,9 +64,9 @@ struct gpio_desc { #define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1) #define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE)) @@ -14,7 +12,7 @@ Index: linux-3.1.10/drivers/gpio/gpiolib.c }; static struct gpio_desc gpio_desc[ARCH_NR_GPIOS]; -@@ -76,9 +76,9 @@ +@@ -76,9 +76,9 @@ static DEFINE_IDR(dirent_idr); static inline void desc_set_label(struct gpio_desc *d, const char *label) { @@ -26,7 +24,7 @@ Index: linux-3.1.10/drivers/gpio/gpiolib.c } /* Warn when drivers omit gpio_request() calls -- legal but ill-advised -@@ -727,7 +727,6 @@ +@@ -727,7 +727,6 @@ int gpio_export(unsigned gpio, bool dire if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) ioname = desc->chip->names[gpio - desc->chip->base]; @@ -34,7 +32,7 @@ Index: linux-3.1.10/drivers/gpio/gpiolib.c if (status == 0) { struct device *dev; -@@ -1347,11 +1346,11 @@ +@@ -1347,11 +1346,11 @@ const char *gpiochip_is_requested(struct return NULL; if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) return NULL; |