summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-07-17 18:18:31 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-20 12:28:17 +0200
commit5daed07401ed27bb2684e803f3f01e3a424ea282 (patch)
tree662980d51a0866a6d5640e7106427376e8466f66 /drivers/media/video/ivtv
parentV4L/DVB (8378): cx18: move cx18_av_vbi_setup to av-core.c and rename to cx18_... (diff)
downloadlinux-5daed07401ed27bb2684e803f3f01e3a424ea282.tar.xz
linux-5daed07401ed27bb2684e803f3f01e3a424ea282.zip
V4L/DVB (8379): saa7127: Make device detection optional
The saa7127 driver supports all of SAA7126, SAA7127, SAA7128 and SAA1729 devices. Declare all these devices, so that board drivers can tell which device is present, instead of always relying on auto-detection (which needs to write to the chip, eek!). We still need the detection for ivtv, so a special device name "saa7127_auto" can be used when the caller doesn't know exactly which device is present. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/ivtv')
-rw-r--r--drivers/media/video/ivtv/ivtv-i2c.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index a1b37ff8669c..af154238fb9a 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -135,7 +135,7 @@ static const u8 hw_addrs[] = {
static const char * const hw_devicenames[] = {
"cx25840",
"saa7115",
- "saa7127",
+ "saa7127_auto", /* saa7127 or saa7129 */
"msp3400",
"tuner",
"wm8775",