]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 41f424b) | patch
gspca/konica: Fix compilation merge conflict
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 6 Sep 2010 16:57:22 +0000 (13:57 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 03:04:46 +0000 (01:04 -0200)
commit76e241d421e785dacdc8f7a4c39ecc42c8313a9e
tree546669d2b164b86f7ac4abb7e800de511d565336tree | snapshot
parent41f424ba4ddc9ea0b241363a24007073c49a6116commit | diff
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 diff | blob | history
Beck SC1x5 Kernel