2 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 5be8265ad..36ae3d090 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -99,8 +99,6 @@ static int av7110_debug = 0;
 #define dprintk	if (av7110_debug) printk
 
 static int vidmode=CVBS_RGB_OUT;
-static int init_vpid;
-static int init_apid;
 static int pids_off;
 static int adac=DVB_ADAC_TI;
 
@@ -4741,9 +4739,6 @@ int av7110_attach (struct saa7146 *saa, void **av7110_ptr)
                 }
         }
 
-	if (init_vpid != 0 || init_apid != 0)
-		ChangePIDs(av7110, init_vpid, init_apid, 0, 0, 0);
-
 	av7110_setup_irc_config (av7110, 0);
         dvb_register(av7110);
 
@@ -4874,8 +4869,6 @@ MODULE_PARM(av7110_debug,"i");
 MODULE_PARM(vidmem,"l");
 MODULE_PARM(vidlow,"l");
 MODULE_PARM(vidmode,"i");
-MODULE_PARM(init_vpid,"i");
-MODULE_PARM(init_apid,"i");
 MODULE_PARM(pids_off,"i");
 MODULE_PARM(adac,"i");
 
diff --git a/linux/drivers/media/dvb/av7110/av7110_ir.c b/linux/drivers/media/dvb/av7110/av7110_ir.c
index 096fa0c62..e706672a1 100644
--- a/linux/drivers/media/dvb/av7110/av7110_ir.c
+++ b/linux/drivers/media/dvb/av7110/av7110_ir.c
@@ -7,6 +7,10 @@
 
 #include "av7110.h"
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45))
+#include "input_fake.h"
+#endif
+
 
 #define UP_TIMEOUT (HZ/2)