diff options
author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 21:25:46 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 10:35:10 -0500 |
commit | 6827709a6148a6e8530d90027b4f31aa0aaa5ae5 (patch) | |
tree | cfd608e91a0ec6f5138746091d998759b3938ac3 /drivers/media/dvb/ttusb-dec | |
parent | 62d50addf0774115adaa9e01e09099c3d7daa13d (diff) |
V4L/DVB (5164): Compat: Handle input_register_device() change and some others
input_register_device() was changed to return an error code instead of
being void in 2.6.15. Handle it with a macro wrapper in config.h. For
this to work, linux/input.h must be included before config.h. This
required some trivial header re-ordering in budget-ci.c and ttusb_dec.c.
In kernel 2.6.15-rc1 a helper function called setup_timer() was added to
linux/timer.h. Add to compat.h, but require that linux/timer.h be
included first to give the definition of struct timer_list.
A new 4GB DMA zone, __GFP_DMA32, was added in 2.6.15-rc2. Alias it to
__GFP_DMA on older kernels.
Handle another 2.6.15 "input_dev->dev to input_dev->cdev.dev" change for
some recently added code in cinergyT2.c.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/ttusb-dec')
-rw-r--r-- | drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index bd6e7baae2ec..78c98b089975 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
@@ -20,8 +20,6 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #include <linux/mutex.h> | ||
24 | |||
25 | #include <linux/list.h> | 23 | #include <linux/list.h> |
26 | #include <linux/module.h> | 24 | #include <linux/module.h> |
27 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
@@ -35,6 +33,8 @@ | |||
35 | #include <linux/init.h> | 33 | #include <linux/init.h> |
36 | #include <linux/input.h> | 34 | #include <linux/input.h> |
37 | 35 | ||
36 | #include <linux/mutex.h> | ||
37 | |||
38 | #include "dmxdev.h" | 38 | #include "dmxdev.h" |
39 | #include "dvb_demux.h" | 39 | #include "dvb_demux.h" |
40 | #include "dvb_filter.h" | 40 | #include "dvb_filter.h" |