Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index c6d470590380..584a83a94a2a 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -28,6 +28,7 @@
 #include "au0828.h"
 #include "au8522.h"
 #include "xc5000.h"
+#include "mxl5007t.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
@@ -45,6 +46,11 @@ static struct xc5000_config hauppauge_hvr950q_tunerconfig = {
         .tuner_callback   = au0828_tuner_callback
 };
 
+static struct mxl5007t_config mxl5007t_hvr950q_config = {
+        .xtal_freq_hz = MxL_XTAL_24_MHZ,
+        .if_freq_hz = MxL_IF_6_MHZ,
+};
+
 /*-------------------------------------------------------------------*/
 static void urb_completion(struct urb *purb)
 {
@@ -342,6 +348,15 @@ int au0828_dvb_register(struct au0828_dev *dev)
                                 &dev->i2c_adap,
                                 &hauppauge_hvr950q_tunerconfig, dev);
                 break;
+        case AU0828_BOARD_HAUPPAUGE_HVR950Q_MXL:
+                dvb->frontend = dvb_attach(au8522_attach,
+                                &hauppauge_hvr950q_config,
+                                &dev->i2c_adap);
+                if (dvb->frontend != NULL)
+                        dvb_attach(mxl5007t_attach, dvb->frontend,
+                                   &dev->i2c_adap, 0x60,
+                                   &mxl5007t_hvr950q_config);
+                break;
         default:
                 printk(KERN_WARNING "The frontend of your DVB/ATSC card "
                        "isn't supported yet\n");