|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
This patch fixes a few errors that were breaking in-kernel compilation.
The first one were at m5602 that were including "gspca.h" from another
directory. A trivial change at m5602/Makefile fixed the issue.
A harder to fix error were caused by the fact that both af9013 and m5602
were declaring an external var called 'debug'. If you compile both
modules in-kernel, you'll have troubles. This is even worse, since there
are two other drivers outside the subsystem with a similar mistake.
To make things worse, gcc do a very great job of fooling the developers,
by blaming the wrong lines anf files when such error occurs.
So, I was having errors like:
drivers/media/dvb/built-in.o: In function `dvb_usercopy':
/home/v4l/tokernel/git/drivers/media/dvb/dvb-core/dvbdev.c:403: multiple definition of `debug'
drivers/media/video/built-in.o:/home/v4l/tokernel/git/drivers/media/video/bt819.c:264: first defined here
or:
drivers/media/dvb/built-in.o: In function `dvb_usercopy':
/home/v4l/tokernel/git/drivers/media/dvb/dvb-core/dvbdev.c:403: multiple definition of `debug'
drivers/media/video/built-in.o:/home/v4l/tokernel/git/drivers/media/video/vpx3220.c:125: first defined here
The two above errors caused by m5602 driver.
After fixing m5602, I got this:
drivers/built-in.o: In function `SiS_SetGroup2':
/home/v4l/tokernel/git/drivers/video/sis/init301.c:6996: multiple definition of `debug'
arch/x86/kernel/built-in.o:/home/v4l/tokernel/git/arch/x86/kernel/entry_32.S:810: first defined here
This one caused by af9013.
This patch fixes those erros by prefixing the debug vars with the name
of the module, without changing the name of the parameter.
Next time, please prepend all extern vars with the name of the module.
To avoid bisect troubles, I've folded those changes with the
original commits that added those modules at my -git tree.
kernel-sync:
CC: Jean-Francois Moine <moinejf@free.fr>
CC: Antti Palosaari <crope@iki.fi>
CC: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
