Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c
index 61849414413f0a77405453b6440c3fc75608a256..22c48d084a2564eaa696ddcad56402e214435d27 100644 (file)
--- a/drivers/usb/musb/musb_procfs.c
+++ b/drivers/usb/musb/musb_procfs.c
@@ -36,7 +36,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>     /* FIXME remove procfs writes */
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 #include "musb_core.h"