summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-09-09 08:14:36 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-09 22:37:35 -0700
commitefb089517d2f34a58aceb600ab58b0ca3db1fa07 (patch)
tree2afc203a1c788c766972748ca2e592d4ea67553e /drivers/tty
parent999156ada570cb4a2eaee42e47c9e659b5c577fb (diff)
downloadop-kernel-dev-efb089517d2f34a58aceb600ab58b0ca3db1fa07.zip
op-kernel-dev-efb089517d2f34a58aceb600ab58b0ca3db1fa07.tar.gz
serial: clps711x: Fix COMPILE_TEST build for target without GPIOLIB support
The patch fixes the following build error of CLPS711X serial driver for targets without GPIOLIB support: >> drivers/tty/serial/serial_mctrl_gpio.c:44:6: error: redefinition of 'mctrl_gpio_set' void mctrl_gpio_set(struct mctrl_gpios *gpios, unsigned int mctrl) ^ In file included from drivers/tty/serial/serial_mctrl_gpio.c:23:0: drivers/tty/serial/serial_mctrl_gpio.h:80:6: note: previous definition of 'mctrl_gpio_set' was here void mctrl_gpio_set(struct mctrl_gpios *gpios, unsigned int mctrl) ^ Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 8079f52..81f6ee7 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -222,7 +222,7 @@ config SERIAL_CLPS711X
tristate "CLPS711X serial port support"
depends on ARCH_CLPS711X || COMPILE_TEST
select SERIAL_CORE
- select SERIAL_MCTRL_GPIO
+ select SERIAL_MCTRL_GPIO if GPIOLIB
help
This enables the driver for the on-chip UARTs of the Cirrus
Logic EP711x/EP721x/EP731x processors.
OpenPOWER on IntegriCloud