summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 11:50:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-08 11:50:17 -0700
commit17d8dfcda6ce570ddc4844f490104fed4af215aa (patch)
treefb56667cfc94545a6907d0ba5bf0df4adadd20e7
parent6ea31c56a54ef79b46b56ad35a308db474d600d3 (diff)
parentcf6c31fc5c3de225348742c95cc6185fca20a2f2 (diff)
downloadlinux-17d8dfcda6ce570ddc4844f490104fed4af215aa.tar.gz
linux-17d8dfcda6ce570ddc4844f490104fed4af215aa.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu fix from Greg Ungerer: "A single fix for compilation breakage to many of the ColdFire CPU targets" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: only use local gpio_request_one if not using GPIOLIB
-rw-r--r--arch/m68k/include/asm/gpio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h
index 8cc8343..2f6eec1 100644
--- a/arch/m68k/include/asm/gpio.h
+++ b/arch/m68k/include/asm/gpio.h
@@ -86,6 +86,7 @@ static inline int gpio_cansleep(unsigned gpio)
return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);
}
+#ifndef CONFIG_GPIOLIB
static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
{
int err;
@@ -105,5 +106,5 @@ static inline int gpio_request_one(unsigned gpio, unsigned long flags, const cha
return err;
}
-
+#endif /* !CONFIG_GPIOLIB */
#endif