summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-09-30 00:06:36 +0000
committerMichael Krufky <devnull@localhost>2005-09-30 00:06:36 +0000
commitc90d48e1feb3cf7ab01471b0c7f92e002b1fc8f3 (patch)
tree7fc63e63b6021ba7fc0fd38254686a1db63e4579 /linux/drivers/media/video/saa7134
parentc65a339a7937abe1611a611ad30aded550add860 (diff)
downloadmediapointer-dvb-s2-c90d48e1feb3cf7ab01471b0c7f92e002b1fc8f3.tar.gz
mediapointer-dvb-s2-c90d48e1feb3cf7ab01471b0c7f92e002b1fc8f3.tar.bz2
DVB/V4L bt8xx tree-merge is currently broken.
If you need this feature, please use an older video4linux cvs: cvs co -D 9/29/05 video4linux
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c
index ca483da88..4e0f5b28a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-input.c
+++ b/linux/drivers/media/video/saa7134/saa7134-input.c
@@ -1,5 +1,5 @@
/*
- * $Id: saa7134-input.c,v 1.29 2005/09/28 20:34:07 nsh Exp $
+ * $Id: saa7134-input.c,v 1.30 2005/09/30 00:06:36 mkrufky Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -585,7 +585,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
ir_codes = videomate_tv_pvr_codes;
mask_keycode = 0x003F00;
mask_keyup = 0x040000;
- break;
+ break;
}
if (NULL == ir_codes) {
printk("%s: Oops: IR config error [card=%d]\n",