diff options
| author | John Crispin <john@openwrt.org> | 2012-03-25 08:50:09 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-03-25 08:50:09 +0000 |
| commit | 0f6a9d5c7c938f40657ca30f588479893606781e (patch) | |
| tree | cdf2baca2c9b0021baa2c2aa256dee52b627028c /target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch | |
| parent | c49f66675e04441b7089abb2aec1e95bda0dfe78 (diff) | |
| download | upstream-0f6a9d5c7c938f40657ca30f588479893606781e.tar.gz upstream-0f6a9d5c7c938f40657ca30f588479893606781e.tar.bz2 upstream-0f6a9d5c7c938f40657ca30f588479893606781e.zip | |
bump kernel to 3.2.12
SVN-Revision: 31060
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 | 52 |
1 files changed, 52 insertions, 0 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 new file mode 100644 index 0000000000..7839327e32 --- /dev/null +++ b/target/linux/lantiq/patches-3.2/205-owrt-gpio-export.patch @@ -0,0 +1,52 @@ +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 @@ + #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,6 @@ + + if (desc->chip->names && desc->chip->names[gpio - desc->chip->base]) + ioname = desc->chip->names[gpio - desc->chip->base]; +- + if (status == 0) { + struct device *dev; + +@@ -1347,11 +1346,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); + |