diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 23:37:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 23:37:59 -0400 |
| commit | 0ff5ce7f30b45cc2014cec465c0e96c16877116e (patch) | |
| tree | 63e3ed2af568aba47162171ad91ccfc440407d05 /drivers/media/video/cx18/cx18-driver.c | |
| parent | c4755d16fce9a4cdbb316c17657444856821bd4b (diff) | |
| parent | ba7cc365f50cee0758e89217875e56ca3d972ed3 (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:
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/cx18-driver.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 9f31befc3139..8f5ed9b4bf83 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
| @@ -567,7 +567,7 @@ static void cx18_load_and_init_modules(struct cx18 *cx) | |||
| 567 | int i; | 567 | int i; |
| 568 | 568 | ||
| 569 | /* load modules */ | 569 | /* load modules */ |
| 570 | #ifndef CONFIG_VIDEO_TUNER | 570 | #ifndef CONFIG_MEDIA_TUNER |
| 571 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); | 571 | hw = cx18_request_module(cx, hw, "tuner", CX18_HW_TUNER); |
| 572 | #endif | 572 | #endif |
| 573 | #ifndef CONFIG_VIDEO_CS5345 | 573 | #ifndef CONFIG_VIDEO_CS5345 |