5 files changed, 11 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/Kconfig b/drivers/media/video/ivtv/Kconfig
index 399f231abb96..5efacb332114 100644
--- a/drivers/media/video/ivtv/Kconfig
+++ b/drivers/media/video/ivtv/Kconfig
@@ -14,6 +14,7 @@ config VIDEO_IVTV
         select VIDEO_CS53L32A
         select VIDEO_WM8775
         select VIDEO_WM8739
+        select VIDEO_VP27SMPX
         select VIDEO_UPD64031A
         select VIDEO_UPD64083
         ---help---
diff --git a/drivers/media/video/ivtv/ivtv-cards.c b/drivers/media/video/ivtv/ivtv-cards.c
index baab14b40e87..e51d7cc35b1c 100644
--- a/drivers/media/video/ivtv/ivtv-cards.c
+++ b/drivers/media/video/ivtv/ivtv-cards.c
@@ -616,7 +616,7 @@ static const struct ivtv_card ivtv_card_gv_mvprx = {
         .hw_video = IVTV_HW_SAA7115 | IVTV_HW_UPD64031A | IVTV_HW_UPD6408X,
         .hw_audio = IVTV_HW_GPIO,
         .hw_audio_ctrl = IVTV_HW_WM8739,
-        .hw_all = IVTV_HW_GPIO | IVTV_HW_SAA7115 | IVTV_HW_TVAUDIO |
+        .hw_all = IVTV_HW_GPIO | IVTV_HW_SAA7115 | IVTV_HW_VP27SMPX |
                   IVTV_HW_TUNER | IVTV_HW_WM8739 |
                   IVTV_HW_UPD64031A | IVTV_HW_UPD6408X,
         .video_inputs = {
@@ -654,7 +654,7 @@ static const struct ivtv_card ivtv_card_gv_mvprx2e = {
         .hw_audio = IVTV_HW_GPIO,
         .hw_audio_ctrl = IVTV_HW_WM8739,
         .hw_all = IVTV_HW_GPIO | IVTV_HW_SAA7115 | IVTV_HW_TUNER |
-                  IVTV_HW_TVAUDIO | IVTV_HW_WM8739,
+                  IVTV_HW_VP27SMPX | IVTV_HW_WM8739,
         .video_inputs = {
                 { IVTV_CARD_INPUT_VID_TUNER,  0, IVTV_SAA71XX_COMPOSITE4 },
                 { IVTV_CARD_INPUT_SVIDEO1,    1, IVTV_SAA71XX_SVIDEO0    },
diff --git a/drivers/media/video/ivtv/ivtv-cards.h b/drivers/media/video/ivtv/ivtv-cards.h
index 91e9e90c14a5..3191920f4c6b 100644
--- a/drivers/media/video/ivtv/ivtv-cards.h
+++ b/drivers/media/video/ivtv/ivtv-cards.h
@@ -33,7 +33,8 @@
 #define IVTV_HW_UPD6408X  (1 << 11)
 #define IVTV_HW_SAA717X   (1 << 12)
 #define IVTV_HW_WM8739    (1 << 13)
-#define IVTV_HW_GPIO      (1 << 14)
+#define IVTV_HW_VP27SMPX  (1 << 14)
+#define IVTV_HW_GPIO      (1 << 15)
 
 #define IVTV_HW_SAA711X   (IVTV_HW_SAA7115 | IVTV_HW_SAA7114)
 
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index cf52111a2dcc..f8ef267e56b2 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -854,6 +854,10 @@ static void ivtv_load_and_init_modules(struct ivtv *itv)
         if (hw & IVTV_HW_MSP34XX)
                 ivtv_request_module(itv, "msp3400");
 #endif
+#ifndef CONFIG_VIDEO_VP27SMPX
+        if (hw & IVTV_HW_VP27SMPX)
+                ivtv_request_module(itv, "vp27smpx");
+#endif
         if (hw & IVTV_HW_TVAUDIO)
                 ivtv_request_module(itv, "tvaudio");
 #ifndef CONFIG_VIDEO_WM8775
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index b3557435456d..5e12ebc2a9de 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -109,6 +109,7 @@ static const u8 hw_driverids[] = {
         I2C_DRIVERID_UPD64083,
         I2C_DRIVERID_SAA717X,
         I2C_DRIVERID_WM8739,
+        I2C_DRIVERID_VP27SMPX,
         0               /* IVTV_HW_GPIO dummy driver ID */
 };
 
@@ -128,6 +129,7 @@ static const char * const hw_drivernames[] = {
         "upd64083",
         "saa717x",
         "wm8739",
+        "vp27smpx",
         "gpio",
 };