From df971dfe066837946222937b94068df80d1270f2 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 10 Dec 2007 17:29:14 -0200 Subject: backout a backward compatibility patch that shouldn't go to master From: Mauro Carvalho Chehab >> I recommend applying all except for the topmost patch: >> >> pvrusb2: Fix compilation for OnAir Creator config >> >> This is a backwards-compat patch that is not needed within the v4l-dvb >> repository nor the upstream kernel, but *is* needed within the pvrusb2 >> svn repository. >> > > Agreed. Just don't pull that. I will deal with the issue in svn later. > -Mike Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c b/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c index 758eccdf9..9a08670d4 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-devattr.c @@ -125,11 +125,7 @@ static const struct pvr2_device_desc pvr2_device_onair_creator = { .shortname = "oac", .client_modules.lst = pvr2_client_onair_creator, .client_modules.cnt = ARRAY_SIZE(pvr2_client_onair_creator), -#ifdef TUNER_LG_TDVS_H06XF .default_tuner_type = TUNER_LG_TDVS_H06XF, -#else - .default_tuner_type = TUNER_LG_TDVS_H062F, -#endif .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE, }; #endif -- cgit v1.2.3