diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 14:50:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-08 14:50:17 -0400 |
| commit | 17d8dfcda6ce570ddc4844f490104fed4af215aa (patch) | |
| tree | fb56667cfc94545a6907d0ba5bf0df4adadd20e7 /arch | |
| parent | 6ea31c56a54ef79b46b56ad35a308db474d600d3 (diff) | |
| parent | cf6c31fc5c3de225348742c95cc6185fca20a2f2 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/gpio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h index 8cc83431805b..2f6eec1e34b4 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) | |||
| 86 | return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio); | 86 | return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio); |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | #ifndef CONFIG_GPIOLIB | ||
| 89 | static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) | 90 | static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label) |
| 90 | { | 91 | { |
| 91 | int err; | 92 | int err; |
| @@ -105,5 +106,5 @@ static inline int gpio_request_one(unsigned gpio, unsigned long flags, const cha | |||
| 105 | 106 | ||
| 106 | return err; | 107 | return err; |
| 107 | } | 108 | } |
| 108 | 109 | #endif /* !CONFIG_GPIOLIB */ | |
| 109 | #endif | 110 | #endif |