From e4d7eefa918267b648ffcaa2a7a6f666a1ba7b58 Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Thu, 27 Mar 2008 14:51:40 -0400
Subject: [PATCH] --- yaml --- r: 91194 b: refs/heads/master c:
 705a752162768fed3e2c26fba5bffdd3a3bd04f2 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-orion/common.c            |  1 +
 trunk/drivers/usb/host/ehci-hcd.c             |  2 +-
 trunk/drivers/usb/host/ehci-orion.c           |  3 +--
 trunk/include/asm-arm/arch-orion/platform.h   |  8 --------
 trunk/include/asm-arm/plat-orion/ehci-orion.h | 19 +++++++++++++++++++
 6 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 trunk/include/asm-arm/plat-orion/ehci-orion.h

diff --git a/[refs] b/[refs]
index 482a694e243a..2e990644cdf8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bac1de2031aa4cad88a437d4410ec289da4f7dc
+refs/heads/master: 705a752162768fed3e2c26fba5bffdd3a3bd04f2
diff --git a/trunk/arch/arm/mach-orion/common.c b/trunk/arch/arm/mach-orion/common.c
index 86d7f7ccfae0..1e124b7b0bde 100644
--- a/trunk/arch/arm/mach-orion/common.c
+++ b/trunk/arch/arm/mach-orion/common.c
@@ -27,6 +27,7 @@
 #include <asm/arch/hardware.h>
 #include <asm/arch/orion.h>
 #include <asm/arch/platform.h>
+#include <asm/plat-orion/ehci-orion.h>
 #include <asm/plat-orion/time.h>
 #include "common.h"
 
diff --git a/trunk/drivers/usb/host/ehci-hcd.c b/trunk/drivers/usb/host/ehci-hcd.c
index 46ee7f4c0912..85074cb36f38 100644
--- a/trunk/drivers/usb/host/ehci-hcd.c
+++ b/trunk/drivers/usb/host/ehci-hcd.c
@@ -1033,7 +1033,7 @@ MODULE_LICENSE ("GPL");
 #define OF_PLATFORM_DRIVER	ehci_hcd_ppc_of_driver
 #endif
 
-#ifdef CONFIG_ARCH_ORION
+#ifdef CONFIG_PLAT_ORION
 #include "ehci-orion.c"
 #define	PLATFORM_DRIVER		ehci_orion_driver
 #endif
diff --git a/trunk/drivers/usb/host/ehci-orion.c b/trunk/drivers/usb/host/ehci-orion.c
index 0f0eb89c8cf3..d187d0313742 100644
--- a/trunk/drivers/usb/host/ehci-orion.c
+++ b/trunk/drivers/usb/host/ehci-orion.c
@@ -12,8 +12,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
-#include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/ehci-orion.h>
 
 #define rdl(off)	__raw_readl(hcd->regs + (off))
 #define wrl(off, val)	__raw_writel((val), hcd->regs + (off))
diff --git a/trunk/include/asm-arm/arch-orion/platform.h b/trunk/include/asm-arm/arch-orion/platform.h
index 0e33fe536ef7..4e09c6c1af46 100644
--- a/trunk/include/asm-arm/arch-orion/platform.h
+++ b/trunk/include/asm-arm/arch-orion/platform.h
@@ -11,14 +11,6 @@
 #ifndef __ASM_ARCH_PLATFORM_H__
 #define __ASM_ARCH_PLATFORM_H__
 
-/*
- * Orion EHCI platform driver data.
- */
-struct orion_ehci_data {
-	struct mbus_dram_target_info	*dram;
-};
-
-
 /*
  * Device bus NAND private data
  */
diff --git a/trunk/include/asm-arm/plat-orion/ehci-orion.h b/trunk/include/asm-arm/plat-orion/ehci-orion.h
new file mode 100644
index 000000000000..785705651e24
--- /dev/null
+++ b/trunk/include/asm-arm/plat-orion/ehci-orion.h
@@ -0,0 +1,19 @@
+/*
+ * include/asm-arm/plat-orion/ehci-orion.h
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __ASM_PLAT_ORION_EHCI_ORION_H
+#define __ASM_PLAT_ORION_EHCI_ORION_H
+
+#include <linux/mbus.h>
+
+struct orion_ehci_data {
+	struct mbus_dram_target_info	*dram;
+};
+
+
+#endif