[media] Fix typos in VIDEO_CX231XX_DVB Kconfig entry

Message ID 1321201000.20271.72.camel@x61.thuisdomein (mailing list archive)
State Accepted, archived
Headers

Commit Message

Paul Bolle Nov. 13, 2011, 4:16 p.m. UTC
  Commit ede676c72d ("[...] add digital support for PV SBTVD hybrid")
added "select MEDIA_TUNER_NXP18271" to the VIDEO_CX231XX_DVB Kconfig
entry. But there's no Kconfig symbol MEDIA_TUNER_NXP18271. That should
have been MEDIA_TUNER_TDA18271. (The code added in that commit uses
tda18271_attach, which is only available if MEDIA_TUNER_TDA18271 is
set.)

The selects of MEDIA_TUNER_XC5000 and MEDIA_TUNER_TDA18271 should only
be done if MEDIA_TUNER_CUSTOMISE isn't set.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
0) git grep tested only. The second statement is pure bluff: I'm not
familiar with the usage of DVB_FE_CUSTOMISE and MEDIA_TUNER_CUSTOMISE. I
only noticed that these two lines looked odd when compared to all
similar lines in drivers/media.

1) Apparently no one noticed because no one build with settings that
could trigger a problem (ie, both MEDIA_TUNER_TDA18271 and
MEDIA_TUNER_CUSTOMISE not set). 

 drivers/media/video/cx231xx/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
  

Patch

diff --git a/drivers/media/video/cx231xx/Kconfig b/drivers/media/video/cx231xx/Kconfig
index ae85a7a..c74ce9e 100644
--- a/drivers/media/video/cx231xx/Kconfig
+++ b/drivers/media/video/cx231xx/Kconfig
@@ -42,8 +42,8 @@  config VIDEO_CX231XX_DVB
 	tristate "DVB/ATSC Support for Cx231xx based TV cards"
 	depends on VIDEO_CX231XX && DVB_CORE
 	select VIDEOBUF_DVB
-	select MEDIA_TUNER_XC5000 if !DVB_FE_CUSTOMISE
-	select MEDIA_TUNER_NXP18271 if !DVB_FE_CUSTOMISE
+	select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMISE
+	select MEDIA_TUNER_TDA18271 if !MEDIA_TUNER_CUSTOMISE
 	select DVB_MB86A20S if !DVB_FE_CUSTOMISE
 
 	---help---