summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/bttv-cards.c3
-rw-r--r--v4l/ChangeLog7
2 files changed, 9 insertions, 1 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 3c5a589bb..5319bb32d 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.92 2005/10/15 12:14:22 nsh Exp $
+ $Id: bttv-cards.c,v 1.93 2005/10/16 06:12:08 nsh Exp $
bttv-cards.c
@@ -543,6 +543,7 @@ struct tvcard bttv_tvcards[] = {
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.audio_hook = avermedia_tv_stereo_audio,
+ .no_gpioirq = 1,
},
[BTTV_BOARD_VHX] = {
.name = "Aimslab Video Highway Xtreme (VHX)",
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 7540d273c..41cec38e2 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-16 06:11 nshmyrev
+
+ * ../linux/drivers/media/video/bttv-cards.c:
+ Don't request GPINT on Avermedia TV Capture 98.
+
+ Signed-off-by: Ray Cole <ray_cole@earthlink.net>.
+
2005-10-16 03:19 mchehab
* ../linux/drivers/media/video/bttv-driver.c: (bttv_common_ioctls),