diff options
| author |   Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-08-19 13:49:20 +1000 |
| commit | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (patch) | |
| tree | e9fc247ed3a26f5369a7ec1b1bd0ef66bda7b4dd /drivers/usb/host/xhci-mem.c | |
| parent | drm/i915: unpin backing storage in dmabuf_unmap (diff) | |
| parent | drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code (diff) | |
| download | linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.tar.xz linux-dev-3387ed83943daf6cb1bb4195ae369067b9cd80ce.zip | |
Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel
* tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danvet/drm-intel: (153 commits)
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
| -rw-r--r-- | drivers/usb/host/xhci-mem.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index df6978abd7e6..6f8c2fd47675 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -24,6 +24,7 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/dmapool.h> +#include <linux/dma-mapping.h> #include "xhci.h" |