This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/media-tree.git tree:
Subject: gspca/konica: Fix compilation merge conflict Author: Mauro Carvalho Chehab <[email protected]> Date: Mon Sep 6 13:57:22 2010 -0300 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 <[email protected]> drivers/media/video/gspca/konica.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- http://git.linuxtv.org/media-tree.git?a=commitdiff;h=18a380d2b73ae3d492e70e3004e35ad40322e52b diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c index 8cdf1af..3de67ee 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); _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
