diff options
| author | John Crispin <blogic@openwrt.org> | 2011-10-10 15:13:46 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2011-10-10 15:13:46 +0000 |
| commit | 4cc422e0f3860fbe49957352cfb7cd61e5e884d3 (patch) | |
| tree | 0f8c817f0dfc9ae67a7e62306b3070c4b4c8f1c0 /target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch | |
| parent | 4f21c56812d340411d24db0a330beac3db9a0bd8 (diff) | |
| download | upstream-4cc422e0f3860fbe49957352cfb7cd61e5e884d3.tar.gz upstream-4cc422e0f3860fbe49957352cfb7cd61e5e884d3.tar.bz2 upstream-4cc422e0f3860fbe49957352cfb7cd61e5e884d3.zip | |
[lantiq]
* update patches to 3.0
* add basic vr9 support
* backport 3.1 fixes
* backport 3.2 queue (falcon)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28405 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch b/target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch new file mode 100644 index 0000000000..61693c2383 --- /dev/null +++ b/target/linux/lantiq/patches-3.0/205-owrt-gpio-export.patch @@ -0,0 +1,54 @@ +Index: linux-3.0.3/drivers/gpio/gpiolib.c +=================================================================== +--- linux-3.0.3.orig/drivers/gpio/gpiolib.c 2011-10-03 00:13:35.359561120 +0200 ++++ linux-3.0.3/drivers/gpio/gpiolib.c 2011-10-03 09:52:55.785047081 +0200 +@@ -64,9 +64,9 @@ + #define GPIO_FLAGS_MASK ((1 << ID_SHIFT) - 1) + #define GPIO_TRIGGER_MASK (BIT(FLAG_TRIG_FALL) | BIT(FLAG_TRIG_RISE)) + +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + const char *label; +-#endif ++//#endif + }; + static struct gpio_desc gpio_desc[ARCH_NR_GPIOS]; + +@@ -76,9 +76,9 @@ + + static inline void desc_set_label(struct gpio_desc *d, const char *label) + { +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + d->label = label; +-#endif ++//#endif + } + + /* Warn when drivers omit gpio_request() calls -- legal but ill-advised +@@ -727,7 +727,8 @@ + + if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) + ioname = desc->chip->names[gpio - desc->chip->base]; +- ++ else ++ ioname = gpio_desc[gpio].label; + if (status == 0) { + struct device *dev; + +@@ -1347,11 +1348,11 @@ + return NULL; + if (test_bit(FLAG_REQUESTED, &gpio_desc[gpio].flags) == 0) + return NULL; +-#ifdef CONFIG_DEBUG_FS ++//#ifdef CONFIG_DEBUG_FS + return gpio_desc[gpio].label; +-#else +- return "?"; +-#endif ++//#else ++// return "?"; ++//#endif + } + EXPORT_SYMBOL_GPL(gpiochip_is_requested); + |