Merge pull request torvalds#122 from bw35/kernel-build-fixes

Kernel build fixes
CkNoSFeRaTU · Mar 18, 2016 · 11d8d01 · 11d8d01
2 parents c9626a9 + d46d581
commit 11d8d01
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/drivers/media/pci/saa716x/Kconfig b/drivers/media/pci/saa716x/Kconfig
@@ -17,6 +17,19 @@ config SAA716X_CORE
 config DVB_SAA716X_BUDGET
 	tristate "SAA7160/1/2 based Budget PCIe cards (DVB only)"
 	depends on SAA716X_CORE && DVB_CORE
+	select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_MB86A16 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_TAS2101 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_ISL6422 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_CXD2820R if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT
+	select MEDIA_TUNER_AV201X if MEDIA_SUBDRV_AUTOSELECT
+	select MEDIA_TUNER_TDA18212 if MEDIA_SUBDRV_AUTOSELECT
+	select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
+
 
 	help
 	  Support for the SAA7160/1/2 based Budget PCIe DVB cards
@@ -32,6 +45,10 @@ config DVB_SAA716X_BUDGET
 config DVB_SAA716X_HYBRID
 	tristate "SAA7160/1/2 based Hybrid PCIe cards (DVB + Analog)"
 	depends on SAA716X_CORE && DVB_CORE
+	select DVB_MB86A16 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_TDA1004X if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
+	select MEDIA_TUNER_TDA827X if MEDIA_SUBDRV_AUTOSELECT
 
 	help
 	  Support for the SAA7160/1/2 based Hybrid PCIe DVB cards
@@ -50,6 +67,10 @@ config DVB_SAA716X_FF
 	depends on SAA716X_CORE && DVB_CORE
 	depends on INPUT # IR
 
+	select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_ISL6423 if MEDIA_SUBDRV_AUTOSELECT
+
 	help
 	  Support for the SAA7160/1/2 based  Full fledged PCIe DVB cards
 	  These cards do feature a hardware MPEG decoder and other

diff --git a/drivers/media/pci/saa716x/Makefile b/drivers/media/pci/saa716x/Makefile
@@ -23,4 +23,4 @@ obj-$(CONFIG_DVB_SAA716X_BUDGET)  += saa716x_budget.o
 obj-$(CONFIG_DVB_SAA716X_HYBRID)  += saa716x_hybrid.o
 obj-$(CONFIG_DVB_SAA716X_FF)	  += saa716x_ff.o
 
-EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/
+EXTRA_CFLAGS = -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ -Idrivers/media/dvb-core/ -Idrivers/media/dvb-frontends/ -Idrivers/media/tuners/