[patch] bttv: MODULE_PARM() broke TV

[Akinobu Mita]

Hello,

Using both module_param() and MODULE_PARM() in one module broke my
bttv options.

	bttv: Unknown parameter `card'
	bttv: Ignoring new-style parameters in presence of obsolete ones
	...

This patch fixes it, and now I'm watching TV as usual fine.

--- 2.6-mm/drivers/media/video/bttv-cards.c.orig	2004-11-06 13:37:46.000000000 +0900
+++ 2.6-mm/drivers/media/video/bttv-cards.c	2004-11-06 13:42:09.000000000 +0900
@@ -2973,7 +2973,7 @@ static int __devinit pvr_altera_load(str
 /* old 2.4.x way -- via soundcore's mod_firmware_load */
 
 static char *firm_altera = "/usr/lib/video4linux/hcwamc.rbf";
-MODULE_PARM(firm_altera,"s");
+module_param(firm_altera, charp, 0);
 MODULE_PARM_DESC(firm_altera,"WinTV/PVR firmware "
 		 "(driver CD => unzip pvr45xxx.exe => hcwamc.rbf)");
 
--- 2.6-mm/drivers/media/video/bttv-i2c.c.orig	2004-11-06 13:37:53.000000000 +0900
+++ 2.6-mm/drivers/media/video/bttv-i2c.c	2004-11-06 13:53:17.000000000 +0900
@@ -47,9 +47,9 @@ static int detach_inform(struct i2c_clie
 static int i2c_debug = 0;
 static int i2c_hw = 0;
 static int i2c_scan = 0;
-MODULE_PARM(i2c_debug,"i");
-MODULE_PARM(i2c_hw,"i");
-MODULE_PARM(i2c_scan,"i");
+module_param(i2c_debug, int, 0);
+module_param(i2c_hw, int, 0);
+module_param(i2c_scan, int, 0);
 MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time");
 
 /* ----------------------------------------------------------------------- */


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/