diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 14:02:37 -0500 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /drivers | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
| download | linux-stable-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.gz linux-stable-3a8254364277fabe01bc0e12b9691722939f5ef3.tar.bz2 linux-stable-3a8254364277fabe01bc0e12b9691722939f5ef3.zip | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/musb/musb_debugfs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/usb/musb/musb_debugfs.c b/drivers/usb/musb/musb_debugfs.c index b0176e4569e0..61f4ee466df7 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" |