diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-05 22:33:58 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-05 22:33:58 -0200 |
| commit | 24f89f1e167838425e9ac9b9a1a4143a969ff0ac (patch) | |
| tree | 0368c452ebdbc07c2aabbcfd1f9ceee15a63a76d /linux/drivers/media/video/cx25840 | |
| parent | 48a5b962830004fe6d60560781a6a21e1919c68f (diff) | |
| download | mediapointer-dvb-s2-24f89f1e167838425e9ac9b9a1a4143a969ff0ac.tar.gz mediapointer-dvb-s2-24f89f1e167838425e9ac9b9a1a4143a969ff0ac.tar.bz2 | |
Fix an error on cx25840
From: Mauro Carvalho Chehab <mchehab@redhat.com>
On Mon, 2009-01-05 at 15:10 +0100, Gregoire Favre wrote:
> Hello,
>
> compilation of today v4l-hg fails at :
>
> CC [M] /usr/src/CVS/v4l-dvb/v4l/cx23885-417.o
> CC [M] /usr/src/CVS/v4l-dvb/v4l/cx25840-core.o
> /usr/src/CVS/v4l-dvb/v4l/cx25840-core.c:186: error: duplicate
'static'
> make[2]: *** [/usr/src/CVS/v4l-dvb/v4l/cx25840-core.o] Error 1
> make[1]: *** [_module_/usr/src/CVS/v4l-dvb/v4l] Error 2
> make[1]: Leaving directory `/usr/src/linux-2.6.28-gentoo'
> make: *** [default] Error 2
I find the output of an sparse build amusing:
marune/build/v4l-dvb-master/v4l/cx25840-core.c:186:8: error: Just how
static do you want this type to be?
/marune/build/v4l-dvb-master/v4l/cx25840-core.c:186: error: duplicate
'static'
make[3]: *** [/marune/build/v4l-dvb-master/v4l/cx25840-core.o] Error 1
The change that introduced it follows. The first part of the change,
with the 2 "static"s is the problem. The second part of the change,
for
older kernels is correct. Remove the duplicate static keyword and the
code will compile.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx25840')
| -rw-r--r-- | linux/drivers/media/video/cx25840/cx25840-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c index 4e0a1e88f..479700c8c 100644 --- a/linux/drivers/media/video/cx25840/cx25840-core.c +++ b/linux/drivers/media/video/cx25840/cx25840-core.c @@ -183,7 +183,7 @@ static void cx25836_initialize(struct i2c_client *client) } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) -static static void cx25840_work_handler(struct work_struct *work) +static void cx25840_work_handler(struct work_struct *work) { struct cx25840_state *state = container_of(work, struct cx25840_state, fw_work); #else |