Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (229 commits)
  USB: remove unused usb_buffer_alloc and usb_buffer_free macros
  usb: musb: update gfp/slab.h includes
  USB: ftdi_sio: fix legacy SIO-device header
  USB: kl5usb105: reimplement using generic framework
  USB: kl5usb105: minor clean ups
  USB: kl5usb105: fix memory leak
  USB: io_ti: use kfifo to implement write buffering
  USB: io_ti: remove unsused private counter
  USB: ti_usb: use kfifo to implement write buffering
  USB: ir-usb: fix incorrect write-buffer length
  USB: aircable: fix incorrect write-buffer length
  USB: safe_serial: straighten out read processing
  USB: safe_serial: reimplement read using generic framework
  USB: safe_serial: reimplement write using generic framework
  usb-storage: always print quirks
  USB: usb-storage: trivial debug improvements
  USB: oti6858: use port write fifo
  USB: oti6858: use kfifo to implement write buffering
  USB: cypress_m8: use kfifo to implement write buffering
  USB: cypress_m8: remove unused drain define
  ...

Fix up conflicts (due to usb_buffer_alloc/free renaming) in
	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

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index f7aae2293758..b9dd74fde212 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -2493,10 +2493,10 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision)
                 }
                 usbvision->sbuf[bufIdx].urb = urb;
                 usbvision->sbuf[bufIdx].data =
-                        usb_buffer_alloc(usbvision->dev,
-                                         sb_size,
-                                         GFP_KERNEL,
-                                         &urb->transfer_dma);
+                        usb_alloc_coherent(usbvision->dev,
+                                           sb_size,
+                                           GFP_KERNEL,
+                                           &urb->transfer_dma);
                 urb->dev = dev;
                 urb->context = usbvision;
                 urb->pipe = usb_rcvisocpipe(dev, usbvision->video_endp);
@@ -2552,10 +2552,10 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision)
         for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) {
                 usb_kill_urb(usbvision->sbuf[bufIdx].urb);
                 if (usbvision->sbuf[bufIdx].data){
-                        usb_buffer_free(usbvision->dev,
-                                        sb_size,
-                                        usbvision->sbuf[bufIdx].data,
-                                        usbvision->sbuf[bufIdx].urb->transfer_dma);
+                        usb_free_coherent(usbvision->dev,
+                                          sb_size,
+                                          usbvision->sbuf[bufIdx].data,
+                                          usbvision->sbuf[bufIdx].urb->transfer_dma);
                 }
                 usb_free_urb(usbvision->sbuf[bufIdx].urb);
                 usbvision->sbuf[bufIdx].urb = NULL;