| commit | 76e241d421e785dacdc8f7a4c39ecc42c8313a9e | |
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | |
| Mon, 6 Sep 2010 16:57:22 +0000 (6 13:57 -0300) | ||
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | |
| Thu, 21 Oct 2010 03:04:46 +0000 (21 01:04 -0200) | ||
| tree | 546669d2b164b86f7ac4abb7e800de511d565336 | treesnapshot (tar.gz zip) |
| parent | 41f424ba4ddc9ea0b241363a24007073c49a6116 | commitdiff |
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>
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>
| drivers/media/video/gspca/konica.c | diffblobblamehistory |