---

yaml --- r: 330662 b: refs/heads/master c: 8572211 h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 71a5412 · 71a5412
1 parent 7b80809
commit 71a5412
Show file tree

Hide file tree

Showing 5 changed files with 558 additions and 926 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de73beeed032f93f0106992c075357be5b1f2fab
+refs/heads/master: 8572211842afc53c8450fb470f2b8d02ba7592e0
diff --git a/trunk/drivers/media/dvb/dvb-usb/Kconfig b/trunk/drivers/media/dvb/dvb-usb/Kconfig
@@ -426,7 +426,7 @@ config DVB_USB_IT913X
 
 config DVB_USB_MXL111SF
 	tristate "MxL111SF DTV USB2.0 support"
-	depends on DVB_USB
+	depends on DVB_USB_V2
 	select DVB_LGDT3305 if !DVB_FE_CUSTOMISE
 	select DVB_LG2160 if !DVB_FE_CUSTOMISE
 	select VIDEO_TVEEPROM

diff --git a/trunk/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c b/trunk/drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
@@ -31,6 +31,8 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info (or-able)).");
 	if (mxl111sf_tuner_debug) \
 		mxl_printk(KERN_DEBUG, fmt, ##arg)
 
+#define err pr_err
+
 /* ------------------------------------------------------------------------ */
 
 struct mxl111sf_tuner_state {