Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / musb / musb_core.c

diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 1404a10a3e62212e16a811d00fc1a6409c62008c..bcc92e69c426e7f5fac5876e12f4cfcc0aa8f9cc 100644 (file)
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -82,7 +82,7 @@
 /*
  * This gets many kinds of configuration information:
  *     - Kconfig for everything user-configurable
- *     - <asm/arch/hdrc_cnf.h> for SOC or family details
+ *     - <mach/hdrc_cnf.h> for SOC or family details
  *     - platform_device for addressing, irq, and platform_data
  *     - platform_data is mostly for board-specific informarion
  *
@@ -100,8 +100,8 @@
 #include <linux/io.h>
 
 #ifdef CONFIG_ARM
-#include <asm/arch/hardware.h>
-#include <asm/arch/memory.h>
+#include <mach/hardware.h>
+#include <mach/memory.h>
 #include <asm/mach-types.h>
 #endif