Revert "musb_hdrc: Fix includes to compile"

This reverts commit 87bc54d6ed96d44eaffe8699ef812a9a32520726.

Redo this as #include <mach/memory.h> should be <asm/memory.h>
as pointed out by Russell King.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index d443a61e5c3b81cebd13ea4ec7673ae1f686893e..75baf181a8cdff08098ec180e23cffdaaa430987 100644 (file)
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -31,15 +31,15 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
-#include <mach/memory.h>
-#include <mach/gpio.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/memory.h>
+#include <asm/arch/gpio.h>
 #include <asm/mach-types.h>
 
 #include "musb_core.h"
 
 #ifdef CONFIG_MACH_DAVINCI_EVM
-#include <mach/i2c-client.h>
+#include <asm/arch/i2c-client.h>
 #endif
 
 #include "davinci.h"

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 128e949db47c4a2c64f0156a2c7c227ef8f16fd1..c5b8f0296fcf2f9f9a7ab40404d1f8324e325508 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -100,8 +100,8 @@
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM
-#include <mach/hardware.h>
-#include <mach/memory.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/memory.h>
 #include <asm/mach-types.h>
 #endif
 

diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 9d2dcb121c5e95cc7e6ba81a5cdfa59ae07637ae..298b22e6ad0dd999afaa7872fafd3babdbdfe960 100644 (file)
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -35,8 +35,8 @@
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
-#include <mach/mux.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/mux.h>
 
 #include "musb_core.h"
 #include "omap2430.h"

diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index dc7670718cd2ba4bfd8aa4f080b54a2de0fe3a86..786a62071f7236382be179f2cf3116d10f2e5135 100644 (file)
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -11,8 +11,8 @@
 #define __MUSB_OMAP243X_H__
 
 #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3430)
-#include <mach/hardware.h>
-#include <mach/usb.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/usb.h>
 
 /*
  * OMAP2430-specific definitions

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 7e073a0d7ac9b5428797d27857e883cd227d34f9..52f7f29cebdadf02f82ec5d5a910e04f93749377 100644 (file)
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -15,8 +15,8 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <mach/dma.h>
-#include <mach/mux.h>
+#include <asm/arch/dma.h>
+#include <asm/arch/mux.h>
 
 #include "musb_core.h"