diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-09-06 20:57:22 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 07:04:46 +0400 |
| commit | 76e241d421e785dacdc8f7a4c39ecc42c8313a9e (patch) | |
| tree | 546669d2b164b86f7ac4abb7e800de511d565336 /drivers/media/video/gspca/konica.c | |
| parent | 41f424ba4ddc9ea0b241363a24007073c49a6116 (diff) | |
| download | linux-76e241d421e785dacdc8f7a4c39ecc42c8313a9e.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/gspca/konica.c')
| -rw-r--r-- | drivers/media/video/gspca/konica.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/konica.c b/drivers/media/video/gspca/konica.c index 8cdf1af4257e..3de67ee5c230 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); |