diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /arch/arm/plat-omap/usb.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/plat-omap/usb.c')
| -rw-r--r-- | arch/arm/plat-omap/usb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 98f1c76f8660..14a836d7ac25 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
| 34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 35 | #include <asm/hardware.h> | 35 | #include <asm/hardware.h> |
| 36 | #include <asm/mach-types.h> | ||
| 37 | 36 | ||
| 38 | #include <asm/arch/mux.h> | 37 | #include <asm/arch/mux.h> |
| 39 | #include <asm/arch/usb.h> | 38 | #include <asm/arch/usb.h> |