]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4200131) | 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)
commit062d685c01b56d1e4c49217bf8bbb02b15b5fe55
tree546669d2b164b86f7ac4abb7e800de511d565336tree | snapshot
parent4200131165c840bb68e967f6634b41565a339890commit | 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
Linux Kernel Source Tree.