diff options
| author | Neil Brown <neilb@notabene.brown> | 2008-07-07 20:11:50 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@notabene.brown> | 2008-07-07 20:11:50 -0400 |
| commit | 5b1a4bf220a8f6f2650fdfdfebfda0f22f674d97 (patch) | |
| tree | a1f22225aace571661c29e59ebd024bc4619e054 /drivers/media/video/cx18/Kconfig | |
| parent | 1fe797e67fb07d605b82300934d0de67068a0aca (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/media/video/cx18/Kconfig')
| -rw-r--r-- | drivers/media/video/cx18/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index 5f942690570c..9aefdc5ea79a 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig | |||
| @@ -10,8 +10,8 @@ config VIDEO_CX18 | |||
| 10 | select VIDEO_TVEEPROM | 10 | select VIDEO_TVEEPROM |
| 11 | select VIDEO_CX2341X | 11 | select VIDEO_CX2341X |
| 12 | select VIDEO_CS5345 | 12 | select VIDEO_CS5345 |
| 13 | select DVB_S5H1409 | 13 | select DVB_S5H1409 if !DVB_FE_CUSTOMISE |
| 14 | select MEDIA_TUNER_MXL5005S | 14 | select MEDIA_TUNER_MXL5005S if !DVB_FE_CUSTOMISE |
| 15 | ---help--- | 15 | ---help--- |
| 16 | This is a video4linux driver for Conexant cx23418 based | 16 | This is a video4linux driver for Conexant cx23418 based |
| 17 | PCI combo video recorder devices. | 17 | PCI combo video recorder devices. |