diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 09:00:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-10 09:00:21 -0700 |
| commit | e6e8ac441cd2c1fed16f1864b170d9d471aeb7fe (patch) | |
| tree | 386c4334758639fd6bb21e6e4414bea6dff9cd37 /drivers/usb/host/xhci.c | |
| parent | 14e94194d10ce2b4207ce7bcdcd5e92a1977fe9f (diff) | |
| parent | 444ce9d44d00969479aa1d2675f305a779369194 (diff) | |
| download | linux-e6e8ac441cd2c1fed16f1864b170d9d471aeb7fe.tar.gz | |
Merge tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are 3 small USB fixes for 3.11-rc5.
One is a fix that the ChromeOS developers ran into on some Intel
hardware, one is a build fix, and the last is a MAINTAINERS update to
help people figure out where to send USB network driver patches.
All of these have been in linux-next for a while"
* tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
MAINTAINERS: Add separate section for USB NETWORKING DRIVERS
usb: xhci: add missing dma-mapping.h includes
usb: core: don't try to reset_device() a port that got just disconnected
Diffstat (limited to 'drivers/usb/host/xhci.c')
| -rw-r--r-- | drivers/usb/host/xhci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 41eb4fc33453..9478caa2f71f 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -27,6 +27,7 @@ #include <linux/moduleparam.h> #include <linux/slab.h> #include <linux/dmi.h> +#include <linux/dma-mapping.h> #include "xhci.h" |