From: Mauro Carvalho Chehab Date: Mon, 6 Sep 2010 16:57:22 +0000 (-0300) Subject: gspca/konica: Fix compilation merge conflict X-Git-Tag: v2.6.37-rc1~64^2~478 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76e241d421e785dacdc8f7a4c39ecc42c8313a9e;p=pandora-kernel.git 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 --- Reading git-diff-tree failed