fix compile error (closes #3799)

SVN-Revision: 11907

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 bca3b4eaae3b631673c669c69b9f7e9301a80130..4cb7642e88220a624afd5bc92dc18a8391f17763 100644 (file)
--- 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 <asm-generic/gpio.h>

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 2e826d43f4b96899d648e162f89575add389e5d6..58e65efa7f3245b6ef559f421750928dd916ffb7 100644 (file)
--- 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.