diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-09 18:07:06 +0000 |
| commit | 1c769dacd06c44528955753c2cac21b1d4b8ddef (patch) | |
| tree | cbd22854f18480a8054382799ade8c765ab618d1 /linux/drivers/media/video/cx88/cx88-input.c | |
| parent | 15e9f7c5dda7607d5080c899de36fe6003e1318c (diff) | |
| download | mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.gz mediapointer-dvb-s2-1c769dacd06c44528955753c2cac21b1d4b8ddef.tar.bz2 | |
From: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
- Lots of small changes to allow compiling with kernel 2.4.
Compilation result not tested yet.
- After this patch, .version should be removed, since its
syntax has changed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 37a73ffba..522ba3f45 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-input.c,v 1.20 2005/09/11 05:39:23 mkrufky Exp $ + * $Id: cx88-input.c,v 1.21 2005/10/09 18:07:06 mchehab Exp $ * * Device driver for GPIO attached remote control interfaces * on Conexant 2388x based TV/DVB cards. @@ -30,9 +30,9 @@ #include <linux/module.h> #include <linux/moduleparam.h> -#include <media/ir-common.h> - +#include "compat.h" #include "cx88.h" +#include <media/ir-common.h> /* ---------------------------------------------------------------------- */ @@ -436,6 +436,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir_input_init(&ir->input, &ir->ir, ir_type, ir_codes); ir->input.name = ir->name; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) ir->input.phys = ir->phys; ir->input.id.bustype = BUS_PCI; ir->input.id.version = 1; @@ -447,7 +448,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) ir->input.id.product = pci->device; } ir->input.dev = &pci->dev; - +#endif /* record handles to ourself */ ir->core = core; core->ir = ir; @@ -578,10 +579,11 @@ void cx88_ir_irq(struct cx88_core *core) /* ---------------------------------------------------------------------- */ +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe"); MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls"); MODULE_LICENSE("GPL"); - +#endif /* * Local variables: * c-basic-offset: 8 |