rpms/kernel/devel kernel.spec, 1.1390, 1.1391 linux-2.6-v4l-dvb-update.patch, 1.4, 1.5

Mauro Carvalho Chehab mchehab at fedoraproject.org
Fri Mar 6 11:45:54 UTC 2009


Author: mchehab

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24678

Modified Files:
	kernel.spec linux-2.6-v4l-dvb-update.patch 
Log Message:
Cleans and fixes some DVB Kconfigs: instead of opening a customize
every time, just open the menu if customize is selected.

This will allow a futher cleanup at config-generic, auto-selecting
the needed frontends only.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1390
retrieving revision 1.1391
diff -u -r1.1390 -r1.1391
--- kernel.spec	6 Mar 2009 03:37:42 -0000	1.1390
+++ kernel.spec	6 Mar 2009 11:45:21 -0000	1.1391
@@ -1806,6 +1806,9 @@
 # and build.
 
 %changelog
+* Wed Mar 06 2009 Mauro Carvalho Chehab <mchehab at redhat.com>
+- drivers/media: Kconfig cleanups and fixes
+
 * Thu Mar 06 2009 Dave Jones <davej at redhat.com>
 - kernel-devel needs include/trace headers. (Josh Stone <jistone at redhat.com>)
 

linux-2.6-v4l-dvb-update.patch:

Index: linux-2.6-v4l-dvb-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-update.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- linux-2.6-v4l-dvb-update.patch	6 Mar 2009 01:45:03 -0000	1.4
+++ linux-2.6-v4l-dvb-update.patch	6 Mar 2009 11:45:21 -0000	1.5
@@ -4617,10 +4617,18 @@
  	int type;
  	int minor;
 diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
-index 49f7b20..bbddc9f 100644
+index 49f7b20..3e58140 100644
 --- a/drivers/media/dvb/dvb-usb/Kconfig
 +++ b/drivers/media/dvb/dvb-usb/Kconfig
-@@ -297,5 +297,6 @@ config DVB_USB_AF9015
+@@ -108,6 +108,7 @@ config DVB_USB_CXUSB
+ 	select DVB_MT352 if !DVB_FE_CUSTOMISE
+ 	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
+ 	select DVB_DIB7000P if !DVB_FE_CUSTOMISE
++	select DVB_LGS8GL5 if !DVB_FE_CUSTOMISE
+ 	select DVB_TUNER_DIB0070 if !DVB_FE_CUSTOMISE
+ 	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+ 	select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE
+@@ -297,5 +298,6 @@ config DVB_USB_AF9015
  	select MEDIA_TUNER_QT1010   if !MEDIA_TUNER_CUSTOMIZE
  	select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMIZE
  	select MEDIA_TUNER_MXL5005S if !MEDIA_TUNER_CUSTOMIZE
@@ -5030,10 +5038,39 @@
  
  /**
 diff --git a/drivers/media/dvb/frontends/Kconfig b/drivers/media/dvb/frontends/Kconfig
-index 0026956..4059d22 100644
+index 0026956..3205e30 100644
 --- a/drivers/media/dvb/frontends/Kconfig
 +++ b/drivers/media/dvb/frontends/Kconfig
-@@ -55,6 +55,13 @@ config DVB_MT312
+@@ -1,17 +1,21 @@
+-menu "Customise DVB Frontends"
+-	depends on DVB_CORE
+-
+ config DVB_FE_CUSTOMISE
+ 	bool "Customise the frontend modules to build"
++	depends on DVB_CORE
+ 	default N
+ 	help
+-	  This allows the user to deselect frontend drivers unnecessary
+-	  for their hardware from the build. Use this option with care
+-	  as deselecting frontends which are in fact necessary will result
+-	  in DVB devices which cannot be tuned due to lack of driver support.
++	  This allows the user to select/deselect frontend drivers for their 
++	  hardware from the build.
++
++	  Use this option with care as deselecting frontends which are in fact
++	  necessary will result in DVB devices which cannot be tuned due to lack
++	  of driver support.
+ 
+ 	  If unsure say N.
+ 
++if DVB_FE_CUSTOMISE
++
++menu "Customise DVB Frontends" 
++
+ comment "Multistandard (satellite) frontends"
+ 	depends on DVB_CORE
+ 
+@@ -55,6 +59,13 @@ config DVB_MT312
  	help
  	  A DVB-S tuner module. Say Y when you want to support this frontend.
  
@@ -5047,7 +5084,7 @@
  config DVB_S5H1420
  	tristate "Samsung S5H1420 based"
  	depends on DVB_CORE && I2C
-@@ -83,6 +90,20 @@ config DVB_STV0299
+@@ -83,6 +94,20 @@ config DVB_STV0299
  	help
  	  A DVB-S tuner module. Say Y when you want to support this frontend.
  
@@ -5068,7 +5105,7 @@
  config DVB_TDA8083
  	tristate "Philips TDA8083 based"
  	depends on DVB_CORE && I2C
-@@ -446,11 +467,11 @@ comment "SEC control devices for DVB-S"
+@@ -446,11 +471,11 @@ comment "SEC control devices for DVB-S"
  	depends on DVB_CORE
  
  config DVB_LNBP21
@@ -5082,6 +5119,12 @@
  
  config DVB_ISL6405
  	tristate "ISL6405 SEC controller"
+@@ -486,3 +511,5 @@ config DVB_AF9013
+ 	help
+ 	  Say Y when you want to support this frontend.
+ endmenu
++
++endif
 diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile
 index af7bdf0..1e3866b 100644
 --- a/drivers/media/dvb/frontends/Makefile
@@ -19673,6 +19716,19 @@
  	.probe = adv7175_probe,
  	.remove = adv7175_remove,
  	.id_table = adv7175_id,
+diff --git a/drivers/media/video/au0828/Kconfig b/drivers/media/video/au0828/Kconfig
+index 018f72b..621ec04 100644
+--- a/drivers/media/video/au0828/Kconfig
++++ b/drivers/media/video/au0828/Kconfig
+@@ -4,7 +4,7 @@ config VIDEO_AU0828
+ 	depends on I2C && INPUT && DVB_CORE && USB
+ 	select I2C_ALGOBIT
+ 	select VIDEO_TVEEPROM
+-	select DVB_AU8522 if !DVB_FE_CUSTOMIZE
++	select DVB_AU8522 if !DVB_FE_CUSTOMISE
+ 	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMIZE
+ 	select MEDIA_TUNER_MXL5007T if !DVB_FE_CUSTOMIZE
+ 	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
 diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
 index a07b7b8..f2ebf84 100644
 --- a/drivers/media/video/bt819.c
@@ -30770,14 +30826,18 @@
  		p->audio_mute ? " (muted)" : "");
  	if (p->audio_mode == V4L2_MPEG_AUDIO_MODE_JOINT_STEREO)
 diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
-index 00f1e2e..b62f16d 100644
+index 00f1e2e..4066ca6 100644
 --- a/drivers/media/video/cx23885/Kconfig
 +++ b/drivers/media/video/cx23885/Kconfig
-@@ -16,6 +16,7 @@ config VIDEO_CX23885
+@@ -15,7 +15,10 @@ config VIDEO_CX23885
+ 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE
  	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
  	select DVB_ZL10353 if !DVB_FE_CUSTOMISE
- 	select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
-+	select DVB_LNBP21 if !DVB_FE_CUSTOMIZE
+-	select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
++	select DVB_TDA10048 if !DVB_FE_CUSTOMISE
++	select DVB_LNBP21 if !DVB_FE_CUSTOMISE
++	select DVB_STV6110 if !DVB_FE_CUSTOMISE
++	select DVB_STV0900 if !DVB_FE_CUSTOMISE
  	select MEDIA_TUNER_MT2131 if !MEDIA_TUNER_CUSTOMIZE
  	select MEDIA_TUNER_XC2028 if !DVB_FE_CUSTOMIZE
  	select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
@@ -49761,6 +49821,19 @@
  	.get_chip_id		= ov772x_get_chip_id,
  #ifdef CONFIG_VIDEO_ADV_DEBUG
  	.get_register		= ov772x_get_register,
+diff --git a/drivers/media/video/pvrusb2/Kconfig b/drivers/media/video/pvrusb2/Kconfig
+index 854c2a8..7f7b05c 100644
+--- a/drivers/media/video/pvrusb2/Kconfig
++++ b/drivers/media/video/pvrusb2/Kconfig
+@@ -40,7 +40,7 @@ config VIDEO_PVRUSB2_DVB
+ 	select DVB_LGDT330X if !DVB_FE_CUSTOMISE
+ 	select DVB_S5H1409 if !DVB_FE_CUSTOMISE
+ 	select DVB_S5H1411 if !DVB_FE_CUSTOMISE
+-	select DVB_TDA10048 if !DVB_FE_CUSTOMIZE
++	select DVB_TDA10048 if !DVB_FE_CUSTOMISE
+ 	select MEDIA_TUNER_TDA18271 if !DVB_FE_CUSTOMIZE
+ 	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
+ 	select MEDIA_TUNER_TDA8290 if !DVB_FE_CUSTOMIZE
 diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
 index de7ee72..d96f0f5 100644
 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -53382,11 +53455,14 @@
  	.remove = saa7127_remove,
  	.id_table = saa7127_id,
 diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig
-index fc2164e..a3470eb 100644
+index fc2164e..e69d504 100644
 --- a/drivers/media/video/saa7134/Kconfig
 +++ b/drivers/media/video/saa7134/Kconfig
-@@ -37,6 +37,8 @@ config VIDEO_SAA7134_DVB
+@@ -35,8 +35,11 @@ config VIDEO_SAA7134_DVB
+ 	select DVB_TDA10086 if !DVB_FE_CUSTOMISE
+ 	select DVB_TDA826X if !DVB_FE_CUSTOMISE
  	select DVB_ISL6421 if !DVB_FE_CUSTOMISE
++	select DVB_ISL6405 if !DVB_FE_CUSTOMISE
  	select MEDIA_TUNER_TDA827X if !MEDIA_TUNER_CUSTOMIZE
  	select MEDIA_TUNER_SIMPLE if !MEDIA_TUNER_CUSTOMIZE
 +	select DVB_ZL10036 if !DVB_FE_CUSTOMISE




More information about the fedora-extras-commits mailing list