diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /drivers/usb/musb/musb_debugfs.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/musb/musb_debugfs.c')
| -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" |