Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
arch/m68k/include/asm/gpio.h
+2
-1
arch/m68k/include/asm/gpio.h
···
86
86
return gpio < MCFGPIO_PIN_MAX ? 0 : __gpio_cansleep(gpio);
87
87
}
88
88
89
+
#ifndef CONFIG_GPIOLIB
89
90
static inline int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
90
91
{
91
92
int err;
···
106
105
107
106
return err;
108
107
}
109
-
108
+
#endif /* !CONFIG_GPIOLIB */
110
109
#endif