diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:42:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:42:07 -0300 |
| commit | 06baaa0441c7fec2a211ddf7c502f837cd988132 (patch) | |
| tree | 284236ae49b1385a091119cf7b3520bc7d64552a /linux/drivers/media/dvb/ttpci/av7110_ir.c | |
| parent | e5561cf14fe189f7f0d726a1c66ffa992354ab2d (diff) | |
| parent | d784aba6717da44bfef18007146f6d00280e39fe (diff) | |
| download | mediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.gz mediapointer-dvb-s2-06baaa0441c7fec2a211ddf7c502f837cd988132.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/fusionhdtv7
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110_ir.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_ir.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110_ir.c b/linux/drivers/media/dvb/ttpci/av7110_ir.c index 18171c051..084164147 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_ir.c +++ b/linux/drivers/media/dvb/ttpci/av7110_ir.c @@ -345,7 +345,6 @@ int __devinit av7110_ir_init(struct av7110 *av7110) input_dev->name = "DVB on-card IR receiver"; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) input_dev->phys = av7110->ir.input_phys; input_dev->id.bustype = BUS_PCI; input_dev->id.version = 2; @@ -365,7 +364,6 @@ int __devinit av7110_ir_init(struct av7110 *av7110) input_dev->dev = &av7110->dev->pci->dev; #endif #endif -#endif /* initial keymap */ memcpy(av7110->ir.key_map, default_key_map, sizeof av7110->ir.key_map); input_register_keys(&av7110->ir); |