diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /drivers | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
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 @@ | |||
| 41 | #include <linux/debugfs.h> | 41 | #include <linux/debugfs.h> |
| 42 | #include <linux/seq_file.h> | 42 | #include <linux/seq_file.h> |
| 43 | 43 | ||
| 44 | #ifdef CONFIG_ARM | ||
| 45 | #include <mach/hardware.h> | ||
| 46 | #include <mach/memory.h> | ||
| 47 | #include <asm/mach-types.h> | ||
| 48 | #endif | ||
| 49 | |||
| 50 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
| 51 | 45 | ||
| 52 | #include "musb_core.h" | 46 | #include "musb_core.h" |