From: Mauro Carvalho Chehab Date: Mon, 6 Sep 2010 16:57:22 +0000 (-0300) Subject: gspca/konica: Fix compilation merge conflict X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=76e241d421e785dacdc8f7a4c39ecc42c8313a9e;p=linux-edison.git gspca/konica: Fix compilation merge conflict drivers/media/video/gspca/konica.c: In function ‘sd_start’: drivers/media/video/gspca/konica.c:322: error: implicit declaration of function ‘usb_buffer_alloc’ drivers/media/video/gspca/konica.c:325: warning: assignment makes pointer from integer without a cast make[3]: ** [drivers/media/video/gspca/konica.o] Erro 1 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c index 8cdf1af4257..3de67ee5c23 100644 --- a/drivers/media/video/gspca/konica.c +++ b/drivers/media/video/gspca/konica.c @@ -319,7 +319,7 @@ static int sd_start(struct gspca_dev *gspca_dev) return -ENOMEM; } gspca_dev->urb[n] = urb; - urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev, + urb->transfer_buffer = usb_alloc_coherent(gspca_dev->dev, packet_size * SD_NPKT, GFP_KERNEL, &urb->transfer_dma);