Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=98ae127cae56b99f2282d73399e0e1ca7dc13bc9
Commit:     98ae127cae56b99f2282d73399e0e1ca7dc13bc9
Parent:     80b522085a2c870ba0c0bdf2415cc925d7c86ca5
Author:     Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 5 09:30:39 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jan 25 19:02:02 2008 -0200

    V4L/DVB (6562): Make HVR900 to use also tveeprom
    
    Hauppauge firmwares can be decoded using tveeprom. This patch adds HVR-900 
as
    a tveeprom client. It also adds xc3028 tuner entry to tveeprom.
    
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/em28xx/em28xx-cards.c |    8 +++++++-
 drivers/media/video/tveeprom.c            |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/media/video/em28xx/em28xx-cards.c 
b/drivers/media/video/em28xx/em28xx-cards.c
index b1afc6c..a2c0794 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -587,11 +587,11 @@ void em28xx_card_setup(struct em28xx *dev)
        /* request some modules */
        switch (dev->model) {
        case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
+       case EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900:
        {
                struct tveeprom tv;
 #ifdef CONFIG_MODULES
                request_module("tveeprom");
-               request_module("ir-kbd-i2c");
 #endif
                /* Call first TVeeprom */
 
@@ -603,6 +603,12 @@ void em28xx_card_setup(struct em28xx *dev)
                        dev->i2s_speed = 2048000;
                        dev->has_msp34xx = 1;
                }
+#ifdef CONFIG_MODULES
+               if (tv.has_ir)
+                       request_module("ir-kbd-i2c");
+#endif
+               /* FIXME: Should also retrieve decoder processor type */
+
                break;
        }
        case EM2820_BOARD_KWORLD_PVRTV2800RF:
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 0faa149..403fbd0 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -226,7 +226,7 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "TCL M2523_3DI_E"},
        { TUNER_ABSENT,        "Samsung THPD5222FG30A"},
        /* 120-129 */
-       { TUNER_ABSENT,        "Xceive XC3028"},
+       { TUNER_XC2028,        "Xceive XC3028"},
        { TUNER_ABSENT,        "Philips FQ1216LME MK5"},
        { TUNER_ABSENT,        "Philips FQD1216LME"},
        { TUNER_ABSENT,        "Conexant CX24118A"},
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to