1 files changed, 16 insertions, 12 deletions

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 4059ea178c2d..a5c6397ad591 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -380,6 +380,21 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 tune_now = 0;
                 break;
         }
+        case TUNER_XC5000C:
+        {
+                struct xc5000_config xc5000c_cfg = {
+                        .i2c_address = t->i2c->addr,
+                        /* if_khz will be set at dvb_attach() */
+                        .if_khz   = 0,
+                        .chip_id  = XC5000C,
+                };
+
+                if (!dvb_attach(xc5000_attach,
+                                &t->fe, t->i2c->adapter, &xc5000c_cfg))
+                        goto attach_failed;
+                tune_now = 0;
+                break;
+        }
         case TUNER_NXP_TDA18271:
         {
                 struct tda18271_config cfg = {
@@ -1314,18 +1329,7 @@ static struct i2c_driver tuner_driver = {
         .id_table       = tuner_id,
 };
 
-static __init int init_tuner(void)
-{
-        return i2c_add_driver(&tuner_driver);
-}
-
-static __exit void exit_tuner(void)
-{
-        i2c_del_driver(&tuner_driver);
-}
-
-module_init(init_tuner);
-module_exit(exit_tuner);
+module_i2c_driver(tuner_driver);
 
 MODULE_DESCRIPTION("device driver for various TV and TV+FM radio tuners");
 MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");