Mauro Carvalho Chehab 76e241d421 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>		2010-10-21 01:04:46 -02:00
..
common	V4L/DVB: NXP TDA18218 silicon tuner driver	2010-10-21 01:04:42 -02:00
dvb	V4L/DVB: af9015: add missing TDA18218 Kconfig option	2010-10-21 01:04:42 -02:00
IR	V4L/DVB: ir-core: Fix null dereferences in the protocols sysfs interface	2010-09-30 07:18:37 -03:00
radio	V4L/DVB: v4l: radio: si470x: fix unneeded free_irq() call	2010-09-30 07:22:41 -03:00
video	gspca/konica: Fix compilation merge conflict	2010-10-21 01:04:46 -02:00
Kconfig	V4L/DVB (13612): IR: Move common IR code to drivers/media/IR	2009-12-16 00:18:42 -02:00
Makefile	V4L/DVB (13612): IR: Move common IR code to drivers/media/IR	2009-12-16 00:18:42 -02:00