From 465cf8207c84d9c934f4f9c8462d6cb24bb3a519 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 22 Jul 2008 11:22:41 +0000 Subject: [brcm47xx] fix compile error (closes #3799) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11907 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch | 8 +++----- .../patches-2.6.25/961-backport_gpio_define_gpio_valid.patch | 8 ++++++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch b/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch index bca3b4eaae..4cb7642e88 100644 --- a/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch +++ b/target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch @@ -31,14 +31,12 @@ Index: linux-2.6.25.10/include/asm-mips/mach-bcm47xx/gpio.h static inline int gpio_request(unsigned gpio, const char *label) { -@@ -52,6 +53,10 @@ static inline int gpio_direction_output( +@@ -52,6 +53,8 @@ static inline int gpio_direction_output( return bcm47xx_gpio_direction_output(gpio, value); } -+static inline int gpio_is_valid(int gpio) -+{ -+ return bcm47xx_gpio_is_valid(gpio); -+} ++#define gpio_is_valid bcm47xx_gpio_is_valid ++ /* cansleep wrappers */ #include diff --git a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch index 2e826d43f4..58e65efa7f 100644 --- a/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch +++ b/target/linux/generic-2.6/patches-2.6.25/961-backport_gpio_define_gpio_valid.patch @@ -121,15 +121,19 @@ index 7e77b6f..464c5b3 100644 struct seq_file; struct module; -@@ -99,6 +105,12 @@ extern int __gpio_cansleep(unsigned gpio); +@@ -99,6 +105,16 @@ extern int __gpio_cansleep(unsigned gpio); #else -+static inline int gpio_is_valid(int number) ++static inline int __gpio_is_valid(int number) +{ + /* only non-negative numbers are valid */ + return number >= 0; +} ++ ++#ifndef gpio_is_valid ++#define gpio_is_valid __gpio_is_valid ++#endif + /* platforms that don't directly support access to GPIOs through I2C, SPI, * or other blocking infrastructure can use these wrappers. -- cgit v1.2.3 /em-br6478acv2/lede/master-31e0f0ae/diff/scripts/patch-specs.sh?h=do-work/Edimax-v2&id=dfd09fc76934cb65c3ac5435e1c41b1600f58e80'>diffstats

path: root/scripts/patch-specs.sh

blob: 3307b6b0904501a83a5f8bc8824d91c9304c6fd1 (plain)