diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-20 15:29:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-20 15:29:35 +1000 |
| commit | 7912880c4c64e4999615e87061cd0ed22962a20e (patch) | |
| tree | 6a119bac6e7b6c5c00cfd093a48051d0df9db200 /drivers/staging/usbip | |
| parent | b129e90efef06f7e92dc104b76dd8cf09c346862 (diff) | |
| parent | 9f50507cb967122f03a6be7efd9d3fe29126d329 (diff) | |
Merge branch 'quilt/usb'
Conflicts:
drivers/input/tablet/acecad.c
drivers/input/tablet/kbtab.c
drivers/input/tablet/wacom_sys.c
drivers/media/video/gspca/gspca.c
sound/usb/usbaudio.c
Diffstat (limited to 'drivers/staging/usbip')
| -rw-r--r-- | drivers/staging/usbip/stub_rx.c | 2 | ||||
| -rw-r--r-- | drivers/staging/usbip/usbip_common.c | 2 | ||||
| -rw-r--r-- | drivers/staging/usbip/vhci.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index bc2674086673..da30658fa048 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c @@ -21,7 +21,7 @@ #include "usbip_common.h" #include "stub.h" -#include "../../usb/core/hcd.h" +#include <linux/usb/hcd.h> static int is_clear_halt_cmd(struct urb *urb) diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index e3fa4216c1cd..52408164036f 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -562,7 +562,7 @@ EXPORT_SYMBOL_GPL(sockfd_to_socket); /* there may be more cases to tweak the flags. */ static unsigned int tweak_transfer_flags(unsigned int flags) { - flags &= ~(URB_NO_TRANSFER_DMA_MAP|URB_NO_SETUP_DMA_MAP); + flags &= ~URB_NO_TRANSFER_DMA_MAP; return flags; } diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h index 5e375173bbce..41a1fe5138f4 100644 --- a/drivers/staging/usbip/vhci.h +++ b/drivers/staging/usbip/vhci.h @@ -18,7 +18,7 @@ */ #include <linux/platform_device.h> -#include "../../usb/core/hcd.h" +#include <linux/usb/hcd.h> struct vhci_device { |