summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-10-18 12:40:54 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-10-18 12:40:54 (GMT)
commitcefd3e71efca6f4ef7f06f1fc507771d76072741 (patch)
treed76cb7969435d5eccdbd3d081555d0a8203ede4a /drivers/usb
parenta26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff)
parent0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff)
downloadlinux-cefd3e71efca6f4ef7f06f1fc507771d76072741.tar.xz
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
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"