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/radio | |
| 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/radio')
| -rw-r--r-- | linux/drivers/media/radio/radio-si470x.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/radio/radio-si470x.c b/linux/drivers/media/radio/radio-si470x.c index b0a1e5832..a5ba4bf21 100644 --- a/linux/drivers/media/radio/radio-si470x.c +++ b/linux/drivers/media/radio/radio-si470x.c @@ -459,11 +459,7 @@ struct si470x_device { unsigned short registers[RADIO_REGISTER_NUM]; /* RDS receive buffer */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - struct work_struct work; -#else struct delayed_work work; -#endif wait_queue_head_t read_queue; struct mutex lock; /* buffer locking */ unsigned char *buffer; /* size is always multiple of three */ |