diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-16 20:28:10 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-12-16 20:28:10 +0100 |
| commit | 2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4 (patch) | |
| tree | 04857b183cef8996c7380ebc8a83b5110c71e15d /drivers/tty | |
| parent | ARM: OMAP2+: common: remove use of vram (diff) | |
| parent | ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h (diff) | |
| download | linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.tar.xz linux-2cb85a7bd2ca6db3ab3d632d0a1b6ca3770ddcf4.zip | |
Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/omap-serial.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ #include <linux/of.h> #include <linux/gpio.h> #include <linux/pinctrl/consumer.h> - -#include <plat/omap-serial.h> +#include <linux/platform_data/serial-omap.h> #define OMAP_MAX_HSUART_PORTS 6 |