diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 00:18:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 00:18:57 +0100 |
| commit | 1456dad9bc9ca2e4a3a4b803a2b25b7fd84e2dae (patch) | |
| tree | 39e9f30596ecb934c0984e397f3e36d742f5ee92 /drivers/tty/serial/max310x.c | |
| parent | hvc: ensure hvc_init is only ever called once in hvc_console.c (diff) | |
| download | linux-1456dad9bc9ca2e4a3a4b803a2b25b7fd84e2dae.tar.xz linux-1456dad9bc9ca2e4a3a4b803a2b25b7fd84e2dae.zip | |
Revert "serial: max310x: Fix build error"
This reverts commit e3c6ea9b1b81b87de96c01d5d37764009d546636 as it
didn't help anything, and caused more problems than expected.
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/max310x.c')
| -rw-r--r-- | drivers/tty/serial/max310x.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/max310x.c b/drivers/tty/serial/max310x.c index ef01d372956a..8dec480a73df 100644 --- a/drivers/tty/serial/max310x.c +++ b/drivers/tty/serial/max310x.c @@ -24,10 +24,9 @@ #include <linux/regmap.h> #include <linux/serial_core.h> #include <linux/serial.h> -#include <linux/spi/spi.h> #include <linux/tty.h> #include <linux/tty_flip.h> -#include <uapi/asm-generic/ioctls.h> +#include <linux/spi/spi.h> #define MAX310X_NAME "max310x" #define MAX310X_MAJOR 204 |