[PATCH 3/5] ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h

Tony Lindgren tony at atomide.com
Wed Nov 21 12:42:30 EST 2012


We need to move this file to allow ARM multiplatform configurations
to build for omap2+. This can now be done as this file now only
contains platform_data.

cc: Russell King <linux at arm.linux.org.uk>
cc: Alan Cox <alan at linux.intel.com>
cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
cc: Govindraj.R <govindraj.raja at ti.com>
cc: Kevin Hilman <khilman at ti.com>
cc: Felipe Balbi <balbi at ti.com>
cc: linux-serial at vger.kernel.org
Signed-off-by: Tony Lindgren <tony at atomide.com>
---
 arch/arm/mach-omap2/serial.c                  |    4 +---
 drivers/tty/serial/omap-serial.c              |    3 +--
 include/linux/platform_data/serial-omap.h     |    0 
 3 files changed, 2 insertions(+), 5 deletions(-)
 rename arch/arm/plat-omap/include/plat/omap-serial.h => include/linux/platform_data/serial-omap.h (100%)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index aa30a3c..25c799b 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -26,9 +26,7 @@
 #include <linux/slab.h>
 #include <linux/pm_runtime.h>
 #include <linux/console.h>
-
-#include <plat/omap-serial.h>
-#include <plat-omap/dma-omap.h>
+#include <linux/platform_data/serial-omap.h>
 
 #include "common.h"
 #include "omap_hwmod.h"
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 17babde..0240aa8 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
 
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/include/linux/platform_data/serial-omap.h
similarity index 100%
rename from arch/arm/plat-omap/include/plat/omap-serial.h
rename to include/linux/platform_data/serial-omap.h




More information about the linux-arm-kernel mailing list