diff options
| author |   Alexander Shiyan <shc_work@mail.ru> | 2014-09-20 09:34:45 +0400 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-20 06:56:55 -0700 |
| commit | 93b8877471796c04c16fdef755d4e5c0f521509f (patch) | |
| tree | 8a09df26c1751584ea63007c9ce2c200d94dcd22 /drivers/tty/serial/serial_mctrl_gpio.c | |
| parent | Merge 3.17-rc5 into tty-next (diff) | |
| download | linux-dev-93b8877471796c04c16fdef755d4e5c0f521509f.tar.xz linux-dev-93b8877471796c04c16fdef755d4e5c0f521509f.zip | |
tty: serial_mctrl_gpio: Fix COMPILE_TEST build for architectures with custom termios.h
This patch fixes COMPILE_TEST build of serial_mctrl_gpio module for
architectures with custom termios.h header.
sparc64:allmodconfig:
In file included from drivers/tty/serial/serial_mctrl_gpio.c:21:0:
include/uapi/asm-generic/termios.h:22:8: error: redefinition of 'struct termio'
./arch/sparc/include/uapi/asm/termbits.h:16:8: note: originally defined here
make[3]: *** [drivers/tty/serial/serial_mctrl_gpio.o] Error 1
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/serial_mctrl_gpio.c')
| -rw-r--r-- | drivers/tty/serial/serial_mctrl_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/serial_mctrl_gpio.c b/drivers/tty/serial/serial_mctrl_gpio.c index bf9560ffe3f4..a3035f997b98 100644 --- a/drivers/tty/serial/serial_mctrl_gpio.c +++ b/drivers/tty/serial/serial_mctrl_gpio.c @@ -18,7 +18,7 @@ #include <linux/err.h> #include <linux/device.h> #include <linux/gpio/consumer.h> -#include <uapi/asm-generic/termios.h> +#include <linux/termios.h> #include "serial_mctrl_gpio.h" |