diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
| commit | d87efd8c3c2acd5d0f96b25514282a84f425419f (patch) | |
| tree | 1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch | |
| parent | 1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff) | |
| download | upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2 upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
SVN-Revision: 31158
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 7839327e32..670b224499 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; |