aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2015-12-18 08:00:49 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-07 17:45:53 -0500
commitc93a59938c11f447ff2964ab3c317311778edf66 (patch)
tree5d455a654f279cafe25c06bf53689297e9813595
parent3b78fae793c027140cfe635ef216bf60aa6498f4 (diff)
serial: 8250: of: Fix the driver and actually compile the 8250_of
The 8250_of never compiled since in the Kconfig we have SERIAL_OF_PLATFORM but in the makefile we expect to have SERIAL_8250_OF... When the 8250_of.c is actually compiled we will have two errors: missing linux/nwpserial.h and 8250/8250.h. Fix those as well at the same time when enable the compilation of the driver. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Fixes: afd7f88f1577 ("serial: 8250: move of_serial code to 8250 directory") Reported-by: Guenter Roeck <linux@roeck-us.net> CC: Arnd Bergmann <arnd@arndb.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Jon Hunter <jonathanh@nvidia.com> Tested-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_of.c3
-rw-r--r--drivers/tty/serial/8250/Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index d66fd24f87cf..33021c1f7d55 100644
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -18,10 +18,9 @@
18#include <linux/of_address.h> 18#include <linux/of_address.h>
19#include <linux/of_irq.h> 19#include <linux/of_irq.h>
20#include <linux/of_platform.h> 20#include <linux/of_platform.h>
21#include <linux/nwpserial.h>
22#include <linux/clk.h> 21#include <linux/clk.h>
23 22
24#include "8250/8250.h" 23#include "8250.h"
25 24
26struct of_serial_info { 25struct of_serial_info {
27 struct clk *clk; 26 struct clk *clk;
diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
index 4ecb80d3549a..b9b9bca5b6c3 100644
--- a/drivers/tty/serial/8250/Makefile
+++ b/drivers/tty/serial/8250/Makefile
@@ -28,6 +28,6 @@ obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o
28obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o 28obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o
29obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o 29obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o
30obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o 30obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o
31obj-$(CONFIG_SERIAL_8250_OF) += 8250_of.o 31obj-$(CONFIG_SERIAL_OF_PLATFORM) += 8250_of.o
32 32
33CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt 33CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt