summaryrefslogtreecommitdiffstats
path: root/drivers/char/buz.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
commit33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch)
tree2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/char/buz.c
parent216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff)
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/char/buz.c')
-rw-r--r--drivers/char/buz.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/buz.c b/drivers/char/buz.c
index 91c131c56..de688ae0b 100644
--- a/drivers/char/buz.c
+++ b/drivers/char/buz.c
@@ -3035,7 +3035,7 @@ static struct video_device zoran_template =
BUZ_NAME,
VID_TYPE_CAPTURE | VID_TYPE_OVERLAY | VID_TYPE_CLIPPING | VID_TYPE_FRAMERAM |
VID_TYPE_SCALES | VID_TYPE_SUBCAPTURE,
- VID_HARDWARE_BT848, /* Not true, but the buz is not yet in the list */
+ VID_HARDWARE_ZR36067,
zoran_open,
zoran_close,
zoran_read,