diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-05 16:05:13 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-05 16:05:13 -0400 |
| commit | f2d0ed7134a15aff53aa9b09489a39bc69b1b211 (patch) | |
| tree | b2098b2feace3340d0946e4b76a30998c9bd3cf6 /drivers/usb/musb/davinci.c | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| parent | 08f75bf14fadaa81fe362d5acda9b77b113dd0a2 (diff) | |
Merge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus
usb: fixes for v3.5-rc1
Here you have the first set of fixes for our v3.5-rc cycle.
It contains a set regression fixes caused by Ido's
usb_endpoint_descriptor usage rework and a build
fix to the musb driver caused by recent changes to
the DaVinci tree.
Nothing really major, the fixes are quite obvious.
Diffstat (limited to 'drivers/usb/musb/davinci.c')
| -rw-r--r-- | drivers/usb/musb/davinci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index 768b4b55c816..9d63ba4d10d6 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | 35 | ||
| 36 | #include <mach/cputype.h> | 36 | #include <mach/cputype.h> |
| 37 | #include <mach/hardware.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/mach-types.h> | 39 | #include <asm/mach-types.h> |
| 39 | 40 | ||