diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:53:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:53:40 -0400 |
| commit | 2d5e3e8d28a7820de1eb7b18a7c15d645bb26992 (patch) | |
| tree | e6af4574977947de83e670dad1f71505b249fe1c /drivers/media/video/saa7134/Kconfig | |
| parent | b57ab7632b8fc1eef139bbbb7a89002be61f99e1 (diff) | |
| parent | aed6abd662c2903733bea7fcd3856c306e650680 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits)
V4L-DVB(7789a): cx18: fix symbol conflict with ivtv driver
V4L/DVB (7789): tuner: remove static dependencies on analog tuner sub-modules
V4L/DVB (7785): [2.6 patch] make mt9{m001,v022}_controls[] static
V4L/DVB (7786): cx18: new driver for the Conexant CX23418 MPEG encoder chip
V4L/DVB (7783): drivers/media/dvb/frontends/s5h1420.c: printk fix
V4L/DVB (7782): pvrusb2: Driver is no longer experimental
V4L/DVB (7781): pvrusb2-dvb: include dvb support by default and update Kconfig help text
V4L/DVB (7780): pvrusb2: always enable support for OnAir Creator / HDTV USB2
V4L/DVB (7779): pvrusb2-dvb: quiet down noise in kernel log for feed debug
Rename common tuner Kconfig names to use the same
Fix V4L/DVB core help messages
V4L/DVB (7769): Move other terrestrial tuners to common/tuners
V4L/DVB (7768): reorganize some DVB-S Kconfig items
V4L/DVB(7767): Move tuners to common/tuners
V4L/DVB (7766): saa7134: add another PCI ID for Beholder M6
V4L/DVB (7765): Add support for Beholder BeholdTV H6
V4L/DVB (7763): ivtv: add tuner support for the AverMedia M116
V4L/DVB (7762): ivtv: fix tuner detection for PAL-N/Nc
V4L/DVB (7761): ivtv: increase the DMA timeout from 100 to 300 ms
V4L/DVB (7759): ivtv: increase version number to 1.2.1
...
Diffstat (limited to 'drivers/media/video/saa7134/Kconfig')
| -rw-r--r-- | drivers/media/video/saa7134/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/Kconfig b/drivers/media/video/saa7134/Kconfig index e086f14d5663..40e4c3bd2cb9 100644 --- a/drivers/media/video/saa7134/Kconfig +++ b/drivers/media/video/saa7134/Kconfig | |||
| @@ -3,7 +3,7 @@ config VIDEO_SAA7134 | |||
| 3 | depends on VIDEO_DEV && PCI && I2C && INPUT | 3 | depends on VIDEO_DEV && PCI && I2C && INPUT |
| 4 | select VIDEOBUF_DMA_SG | 4 | select VIDEOBUF_DMA_SG |
| 5 | select VIDEO_IR | 5 | select VIDEO_IR |
| 6 | select VIDEO_TUNER | 6 | select MEDIA_TUNER |
| 7 | select VIDEO_TVEEPROM | 7 | select VIDEO_TVEEPROM |
| 8 | select CRC32 | 8 | select CRC32 |
| 9 | ---help--- | 9 | ---help--- |
| @@ -35,9 +35,9 @@ config VIDEO_SAA7134_DVB | |||
| 35 | select DVB_NXT200X if !DVB_FE_CUSTOMISE | 35 | select DVB_NXT200X if !DVB_FE_CUSTOMISE |
| 36 | select DVB_TDA10086 if !DVB_FE_CUSTOMISE | 36 | select DVB_TDA10086 if !DVB_FE_CUSTOMISE |
| 37 | select DVB_TDA826X if !DVB_FE_CUSTOMISE | 37 | select DVB_TDA826X if !DVB_FE_CUSTOMISE |
| 38 | select DVB_TDA827X if !DVB_FE_CUSTOMISE | 38 | select MEDIA_TUNER_TDA827X if !DVB_FE_CUSTOMISE |
| 39 | select DVB_ISL6421 if !DVB_FE_CUSTOMISE | 39 | select DVB_ISL6421 if !DVB_FE_CUSTOMISE |
| 40 | select TUNER_SIMPLE if !DVB_FE_CUSTOMISE | 40 | select MEDIA_TUNER_SIMPLE if !DVB_FE_CUSTOMISE |
| 41 | ---help--- | 41 | ---help--- |
| 42 | This adds support for DVB cards based on the | 42 | This adds support for DVB cards based on the |
| 43 | Philips saa7134 chip. | 43 | Philips saa7134 chip. |