diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 22:56:59 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-09 22:56:59 -0300 |
commit | a9e5a96e3a38b1089b19496b26ebfd6d308d48e3 (patch) | |
tree | 41835b4264bb6ad7af269818771d44266b526c22 /linux/drivers/media/dvb/b2c2 | |
parent | 2af26e6a68740096134e432bc8b0fbf46cbd0a27 (diff) | |
parent | 8edb4b5501818f40fd0c88d29df0cfb28edabb99 (diff) | |
download | mediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.gz mediapointer-dvb-s2-a9e5a96e3a38b1089b19496b26ebfd6d308d48e3.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/saa7134
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/b2c2')
-rw-r--r-- | linux/drivers/media/dvb/b2c2/flexcop-pci.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/b2c2/flexcop-pci.c b/linux/drivers/media/dvb/b2c2/flexcop-pci.c index 5baf9ded9..2905ffccf 100644 --- a/linux/drivers/media/dvb/b2c2/flexcop-pci.c +++ b/linux/drivers/media/dvb/b2c2/flexcop-pci.c @@ -67,11 +67,7 @@ struct flexcop_pci { unsigned long last_irq; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - struct work_struct irq_check_work; -#else struct delayed_work irq_check_work; -#endif struct flexcop_device *fc_dev; }; |