upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / drivers / media / video / tda9875.c

diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index fe2b038..4f1114c 100644 (file)
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -34,10 +34,10 @@
 #include <media/audiochip.h>
 #include <media/id.h>
 
-MODULE_PARM(debug,"i");
+static int debug; /* insmod parameter */
+module_param(debug, int, S_IRUGO | S_IWUSR);
 MODULE_LICENSE("GPL");
 
-static int debug = 0;  /* insmod parameter */
 
 /* Addresses to scan */
 static unsigned short normal_i2c[] =  {
@@ -399,7 +399,6 @@ static struct i2c_driver driver = {
 static struct i2c_client client_template =
 {
         I2C_DEVNAME("tda9875"),
-        .id        = -1,
         .driver    = &driver,
 };