Commit cf6c31fc authored Apr 29, 2013 by Greg Ungerer

m68k: only use local gpio_request_one if not using GPIOLIB



Compiling for targets that use the local gpio code (not GPIOLIB) fail to
compile with:

  CC      arch/m68k/platform/coldfire/device.o
In file included from include/linux/gpio.h:45:0,
                 from arch/m68k/platform/coldfire/device.c:15:
/home/gerg/new-wave.git/linux-3.x/arch/m68k/include/asm/gpio.h:89:19: error: static declaration of ‘gpio_request_one’ follows non-static declaration
include/asm-generic/gpio.h:195:12: note: previous declaration of ‘gpio_request_one’ was here

Fix by conditionally using the local gpio_request_one() function based on
!CONFIG_GPIOLIB.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>

parent e4aa937e

arch/m68k/include/asm/gpio.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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