diff options
| -rw-r--r-- | arch/arm/mach-omap2/serial.c | 3 | ||||
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 3 | ||||
| -rw-r--r-- | include/linux/platform_data/serial-omap.h (renamed from arch/arm/plat-omap/include/plat/omap-serial.h) | 0 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index 93d102535c85..04fdbc4c499b 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c | |||
| @@ -27,8 +27,7 @@ | |||
| 27 | #include <linux/pm_runtime.h> | 27 | #include <linux/pm_runtime.h> |
| 28 | #include <linux/console.h> | 28 | #include <linux/console.h> |
| 29 | #include <linux/omap-dma.h> | 29 | #include <linux/omap-dma.h> |
| 30 | 30 | #include <linux/platform_data/serial-omap.h> | |
| 31 | #include <plat/omap-serial.h> | ||
| 32 | 31 | ||
| 33 | #include "common.h" | 32 | #include "common.h" |
| 34 | #include "omap_hwmod.h" | 33 | #include "omap_hwmod.h" |
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 23f797eb7a28..57d6b29c039c 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c | |||
| @@ -41,8 +41,7 @@ | |||
| 41 | #include <linux/of.h> | 41 | #include <linux/of.h> |
| 42 | #include <linux/gpio.h> | 42 | #include <linux/gpio.h> |
| 43 | #include <linux/pinctrl/consumer.h> | 43 | #include <linux/pinctrl/consumer.h> |
| 44 | 44 | #include <linux/platform_data/serial-omap.h> | |
| 45 | #include <plat/omap-serial.h> | ||
| 46 | 45 | ||
| 47 | #define OMAP_MAX_HSUART_PORTS 6 | 46 | #define OMAP_MAX_HSUART_PORTS 6 |
| 48 | 47 | ||
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/include/linux/platform_data/serial-omap.h index ff9b0aab5281..ff9b0aab5281 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/include/linux/platform_data/serial-omap.h | |||