From: Greg Ungerer <gerg@uclinux.org>
Date: Mon, 29 Apr 2013 00:04:46 +0000 (+1000)
Subject: m68k: only use local gpio_request_one if not using GPIOLIB
X-Git-Tag: v3.10-rc5~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf6c31fc5c3de225348742c95cc6185fca20a2f2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed