Replace usb_buffer_free() and usb_buffer_alloc() by usb_free_coherent() and usb_alloc_coherent() making it compile in current tree. Add driver to parent Makefile and Kconfig Signed-off-by: Piotr Chmura <chmooreck@xxxxxxxxxxxxxx> diff -Nur linux.as102.pulled/drivers/staging/Kconfig linux.as102.compiling/drivers/staging/Kconfig --- linux.as102.pulled/drivers/staging/Kconfig 2011-10-14 15:26:42.000000000 +0200 +++ linux.as102.compiling/drivers/staging/Kconfig 2011-10-17 22:26:48.000000000 +0200 @@ -150,4 +150,6 @@ source "drivers/staging/nvec/Kconfig" +source "drivers/staging/media/as102/Kconfig" + endif # STAGING diff -Nur linux.as102.pulled/drivers/staging/Makefile linux.as102.compiling/drivers/staging/Makefile --- linux.as102.pulled/drivers/staging/Makefile 2011-10-14 15:26:42.000000000 +0200 +++ linux.as102.compiling/drivers/staging/Makefile 2011-10-17 22:17:39.439874425 +0200 @@ -66,3 +66,4 @@ obj-$(CONFIG_DRM_PSB) += gma500/ obj-$(CONFIG_INTEL_MEI) += mei/ obj-$(CONFIG_MFD_NVEC) += nvec/ +obj-$(CONFIG_DVB_AS102) += media/as102/ diff -Nur linux.as102.pulled/drivers/staging/media/as102/as102_usb_drv.c linux.as102.compiling/drivers/staging/media/as102/as102_usb_drv.c --- linux.as102.pulled/drivers/staging/media/as102/as102_usb_drv.c 2011-10-17 22:05:15.996841251 +0200 +++ linux.as102.compiling/drivers/staging/media/as102/as102_usb_drv.c 2011-10-17 22:22:33.317887538 +0200 @@ -238,7 +238,7 @@ for (i = 0; i < MAX_STREAM_URB; i++) usb_free_urb(dev->stream_urb[i]); - usb_buffer_free(dev->bus_adap.usb_dev, + usb_free_coherent(dev->bus_adap.usb_dev, MAX_STREAM_URB * AS102_USB_BUF_SIZE, dev->stream, dev->dma_addr); @@ -251,7 +251,7 @@ ENTER(); - dev->stream = usb_buffer_alloc(dev->bus_adap.usb_dev, + dev->stream = usb_alloc_coherent(dev->bus_adap.usb_dev, MAX_STREAM_URB * AS102_USB_BUF_SIZE, GFP_KERNEL, &dev->dma_addr); -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
