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, 7 insertions, 7 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c
index f5e1a2315fcc..912a4d740206 100644
--- a/drivers/media/video/cx231xx/cx231xx-core.c
+++ b/drivers/media/video/cx231xx/cx231xx-core.c
@@ -676,11 +676,11 @@ void cx231xx_uninit_isoc(struct cx231xx *dev)
                                 usb_unlink_urb(urb);
 
                         if (dev->video_mode.isoc_ctl.transfer_buffer[i]) {
-                                usb_buffer_free(dev->udev,
-                                                urb->transfer_buffer_length,
-                                                dev->video_mode.isoc_ctl.
-                                                transfer_buffer[i],
-                                                urb->transfer_dma);
+                                usb_free_coherent(dev->udev,
+                                                  urb->transfer_buffer_length,
+                                                  dev->video_mode.isoc_ctl.
+                                                  transfer_buffer[i],
+                                                  urb->transfer_dma);
                         }
                         usb_free_urb(urb);
                         dev->video_mode.isoc_ctl.urb[i] = NULL;
@@ -767,8 +767,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
                 dev->video_mode.isoc_ctl.urb[i] = urb;
 
                 dev->video_mode.isoc_ctl.transfer_buffer[i] =
-                    usb_buffer_alloc(dev->udev, sb_size, GFP_KERNEL,
-                                     &urb->transfer_dma);
+                    usb_alloc_coherent(dev->udev, sb_size, GFP_KERNEL,
+                                       &urb->transfer_dma);
                 if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) {
                         cx231xx_err("unable to allocate %i bytes for transfer"
                                     " buffer %i%s\n",