Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a5a2ecfc3b9b1f97a7f141bd95ea75097ad49b7c
Commit:     a5a2ecfc3b9b1f97a7f141bd95ea75097ad49b7c
Parent:     59069e53a27605d14a1a693683a45de837ee7521
Author:     Trent Piepho <[EMAIL PROTECTED]>
AuthorDate: Fri Mar 9 15:07:07 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:44:55 2007 -0300

    V4L/DVB (5452): Cx88: merge identical boards
    
    The attach code for HAUPPAUGE_HVR3000 and HAUPPAUGE_HVR1300 is exactly
    the same as the code used by HAUPPAUGE_HVR1100, HAUPPAUGE_HVR1100LP, and
    WINFAST_DTV2000H.  So, those first two cards are added to the case block
    used by the last three.
    
    Signed-off-by: Trent Piepho <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/cx88/cx88-dvb.c |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/drivers/media/video/cx88/cx88-dvb.c 
b/drivers/media/video/cx88/cx88-dvb.c
index 07ec81f..dbfe4dc 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -475,6 +475,8 @@ static int dvb_register(struct cx8802_dev *dev)
        case CX88_BOARD_WINFAST_DTV2000H:
        case CX88_BOARD_HAUPPAUGE_HVR1100:
        case CX88_BOARD_HAUPPAUGE_HVR1100LP:
+       case CX88_BOARD_HAUPPAUGE_HVR1300:
+       case CX88_BOARD_HAUPPAUGE_HVR3000:
                dev->dvb.frontend = dvb_attach(cx22702_attach,
                                               &hauppauge_hvr_config,
                                               &dev->core->i2c_adap);
@@ -693,24 +695,6 @@ static int dvb_register(struct cx8802_dev *dev)
                        dev->dvb.frontend->ops.set_voltage = 
geniatech_dvbs_set_voltage;
                }
                break;
-       case CX88_BOARD_HAUPPAUGE_HVR1300:
-               dev->dvb.frontend = dvb_attach(cx22702_attach,
-                                              &hauppauge_hvr_config,
-                                              &dev->core->i2c_adap);
-               if (dev->dvb.frontend != NULL) {
-                       dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                  &dev->core->i2c_adap, &dvb_pll_fmd1216me);
-               }
-               break;
-       case CX88_BOARD_HAUPPAUGE_HVR3000:
-               dev->dvb.frontend = dvb_attach(cx22702_attach,
-                                              &hauppauge_hvr_config,
-                                              &dev->core->i2c_adap);
-               if (dev->dvb.frontend != NULL) {
-                       dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                  &dev->core->i2c_adap, &dvb_pll_fmd1216me);
-               }
-               break;
        default:
                printk("%s: The frontend of your DVB/ATSC card isn't supported 
yet\n",
                       dev->core->name);
-
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