diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/usb/otg | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/usb/otg')
| -rw-r--r-- | drivers/usb/otg/isp1301_omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/otg/isp1301_omap.c b/drivers/usb/otg/isp1301_omap.c index 77a5f4188999..d54460a88173 100644 --- a/drivers/usb/otg/isp1301_omap.c +++ b/drivers/usb/otg/isp1301_omap.c | |||
| @@ -36,8 +36,8 @@ | |||
| 36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 37 | #include <asm/mach-types.h> | 37 | #include <asm/mach-types.h> |
| 38 | 38 | ||
| 39 | #include <mach/usb.h> | 39 | #include <plat/usb.h> |
| 40 | #include <mach/mux.h> | 40 | #include <plat/mux.h> |
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | #ifndef DEBUG | 43 | #ifndef DEBUG |