diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-03 23:54:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-03 23:54:56 -0400 |
| commit | 73561695b2e77473e353a5ae63bab81ed5098d8e (patch) | |
| tree | d039affaa54d38985e41566e4d62e0aa6a170287 /drivers/media/dvb/ttpci/av7110_ir.c | |
| parent | 6f2f38128170814e151cfedf79532e19cd179567 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_ir.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_ir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c index 6d2256f1e354..665cdb8a3f71 100644 --- a/drivers/media/dvb/ttpci/av7110_ir.c +++ b/drivers/media/dvb/ttpci/av7110_ir.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #define UP_TIMEOUT (HZ/4) | 11 | #define UP_TIMEOUT (HZ/4) |
| 12 | 12 | ||
| 13 | /* enable ir debugging by or'ing av7110_debug with 16 */ | 13 | /* enable ir debugging by or'ing debug with 16 */ |
| 14 | 14 | ||
| 15 | static int ir_initialized; | 15 | static int ir_initialized; |
| 16 | static struct input_dev input_dev; | 16 | static struct input_dev input_dev; |