From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 13 Feb 2014 23:18:57 +0000 (-0800)
Subject: Revert "serial: max310x: Fix build error"
X-Git-Tag: v3.15-rc1~138^2~43
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1456dad9bc9ca2e4a3a4b803a2b25b7fd84e2dae;p=linux.git

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

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