diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 20:37:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 20:37:59 -0700 |
| commit | 0ff5ce7f30b45cc2014cec465c0e96c16877116e (patch) | |
| tree | 63e3ed2af568aba47162171ad91ccfc440407d05 /drivers/media/video/cx18/Kconfig | |
| parent | c4755d16fce9a4cdbb316c17657444856821bd4b (diff) | |
| parent | ba7cc365f50cee0758e89217875e56ca3d972ed3 (diff) | |
| download | op-kernel-dev-0ff5ce7f30b45cc2014cec465c0e96c16877116e.zip op-kernel-dev-0ff5ce7f30b45cc2014cec465c0e96c16877116e.tar.gz | |
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:
V4L/DVB (7798): tuners/Kconfig: Change config name and help to reflect dynamic load for tuners
V4L/DVB (7794): cx88: Fix a warning
V4L/DVB (7792): ivtv: correct misspelled "HIMEM4G" to "HIGHMEM4G" in error message
V4L/DVB (7791): ivtv: POLLHUP must be returned on eof
V4L/DVB (7789b): Fix merge conflicts
Diffstat (limited to 'drivers/media/video/cx18/Kconfig')
| -rw-r--r-- | drivers/media/video/cx18/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/Kconfig b/drivers/media/video/cx18/Kconfig index be654a2..acc4b47 100644 --- a/drivers/media/video/cx18/Kconfig +++ b/drivers/media/video/cx18/Kconfig @@ -4,7 +4,7 @@ config VIDEO_CX18 select I2C_ALGOBIT select FW_LOADER select VIDEO_IR - select VIDEO_TUNER + select MEDIA_TUNER select VIDEO_TVEEPROM select VIDEO_CX2341X select VIDEO_CS5345 |
