---

yaml --- r: 347398 b: refs/heads/master c: d9ba573 h: refs/heads/master v: v3
git-mirror · Dec 14, 2012 · d77c39c · d77c39c
1 parent e1227ae
commit d77c39c
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30a6998ef4474b18d81d8c459f2cbd9e49ff0736
+refs/heads/master: d9ba573718666df2e7e30d671f81bba39d07f91c
diff --git a/trunk/arch/arm/mach-omap2/serial.c b/trunk/arch/arm/mach-omap2/serial.c
@@ -27,8 +27,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/console.h>
 #include <linux/omap-dma.h>
-
-#include <plat/omap-serial.h>
+#include <linux/platform_data/serial-omap.h>
 
 #include "common.h"
 #include "omap_hwmod.h"

diff --git a/trunk/drivers/tty/serial/omap-serial.c b/trunk/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
 

diff --git a/.../arm/plat-omap/include/plat/omap-serial.h → ...include/linux/platform_data/serial-omap.h b/.../arm/plat-omap/include/plat/omap-serial.h → ...include/linux/platform_data/serial-omap.h