Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d8dfcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6ea31c56 cf6c31fc

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