summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-09-08 23:01:33 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-09-08 23:01:33 +0200
commitef1e7dfe864a51061b99a34209c87648b6495ee1 (patch)
tree0e91fed5259b5c4822e65ef448841beb0fc332cd /linux/drivers/media/video
parent9011fc46d1aeb4e9fc4e83a5ea9a7a4aeb353470 (diff)
downloadmediapointer-dvb-s2-ef1e7dfe864a51061b99a34209c87648b6495ee1.tar.gz
mediapointer-dvb-s2-ef1e7dfe864a51061b99a34209c87648b6495ee1.tar.bz2
ivtv: fix broken saa7127 load on kernels < 2.6.26.
From: Hans Verkuil <hverkuil@xs4all.nl> Thanks to Martin Dauskardt for finding this. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-i2c.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-i2c.c b/linux/drivers/media/video/ivtv/ivtv-i2c.c
index 180f541f0..6c37203db 100644
--- a/linux/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/linux/drivers/media/video/ivtv/ivtv-i2c.c
@@ -133,7 +133,11 @@ static const u8 hw_addrs[] = {
static const char * const hw_devicenames[] = {
"cx25840",
"saa7115",
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
"saa7127_auto", /* saa7127 or saa7129 */
+#else
+ "saa7127", /* saa7127 or saa7129 */
+#endif
"msp3400",
"tuner",
"wm8775",