[patch] 2.6.10-rc1-mm4: bttv-driver.c compile error

[Adrian Bunk <bunk@stusta.de>]

On Tue, Nov 09, 2004 at 05:41:28PM +0100, Markus Trippelsdorf wrote:
> On Tue, 2004-11-09 at 07:49 -0800, Andrew Morton wrote:
> 
> > - v4l updates, fbdev updates.
> 
> It does not link here on amd64 using an build-in BT848 driver.  
> 
> LD      vmlinux
> drivers/built-in.o(.init.text+0xba4d): In function `p_radio':
> : undefined reference to `bttv_parse'
> make: *** [vmlinux] Error 1

Thanks for this report.

This problem is not specific to amd64.

@Gerd:
This is caused by your bttv updates included in -mm.

As far as I can see, the radio parameter is already handled correctly.
Is the patch below correct?


Signed-off-by: Adrian Bunk <bunk@stusta.de>

--- linux-2.6.10-rc1-mm4-full/drivers/media/video/bttv-driver.c.old	2004-11-09 21:57:35.000000000 +0100
+++ linux-2.6.10-rc1-mm4-full/drivers/media/video/bttv-driver.c	2004-11-09 22:04:36.000000000 +0100
@@ -127,12 +127,6 @@
 MODULE_AUTHOR("Ralph Metzler & Marcus Metzler & Gerd Knorr");
 MODULE_LICENSE("GPL");
 
-/* kernel args */
-#ifndef MODULE
-static int __init p_radio(char *str) { return bttv_parse(str,BTTV_MAX,radio); }
-__setup("bttv.radio=", p_radio);
-#endif
-
 /* ----------------------------------------------------------------------- */
 /* sysfs                                                                   */