summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-10-24 19:02:37 (GMT)
committerRob Herring <rob.herring@calxeda.com>2011-10-24 19:02:37 (GMT)
commit3a8254364277fabe01bc0e12b9691722939f5ef3 (patch)
tree0befa43780509144cc840f767859006409e0506d /drivers/usb
parent976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff)
parent34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff)
downloadlinux-fsl-qoriq-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.xz
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/musb/musb_debugfs.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c
index b0176e4..61f4ee4 100644
--- a/drivers/usb/musb/musb_debugfs.c
+++ b/drivers/usb/musb/musb_debugfs.c
@@ -41,12 +41,6 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#ifdef CONFIG_ARM
-#include <mach/hardware.h>
-#include <mach/memory.h>
-#include <asm/mach-types.h>
-#endif
-
#include <asm/uaccess.h>
#include "musb_core.h"