Commit 76e241d4 authored Sep 06, 2010 by Mauro Carvalho Chehab

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 <mchehab@redhat.com>

parent 41f424ba

drivers/media/video/gspca/konica.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);