vserver 1.9.5.x5

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

diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 8a577d7..42a9414 100644 (file)
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -26,7 +26,7 @@
 #include <media/saa7146_vv.h>
 
 static int debug = 0;
-MODULE_PARM(debug, "i");
+module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "debug verbosity");
 
 /* global variables */
@@ -68,8 +68,9 @@ static struct saa7146_extension_ioctls ioctls[] = {
 struct hexium
 {
        int type;
-       struct video_device     video_dev;
+       struct video_device     *video_dev;
        struct i2c_adapter      i2c_adapter;    
+
        int cur_input;  /* current input */
 };
 
@@ -237,7 +238,11 @@ static int hexium_probe(struct saa7146_dev *dev)
        saa7146_write(dev, DD1_STREAM_B, 0x00000000);
        saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
 
-       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, I2C_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
+       hexium->i2c_adapter = (struct i2c_adapter) {
+               .class = I2C_CLASS_TV_ANALOG,
+               .name = "hexium orion",
+       };
+       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
        if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
                DEB_S(("cannot register i2c-device. skipping.\n"));
                kfree(hexium);
@@ -494,7 +499,7 @@ static struct saa7146_extension extension = {
        .irq_func = NULL,
 };
 
-int __init hexium_init_module(void)
+static int __init hexium_init_module(void)
 {
        if (0 != saa7146_register_extension(&extension)) {
                DEB_S(("failed to register extension.\n"));
@@ -504,7 +509,7 @@ int __init hexium_init_module(void)
        return 0;
 }
 
-void __exit hexium_cleanup_module(void)
+static void __exit hexium_cleanup_module(void)
 {
        saa7146_unregister_extension(&extension);
 }