diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 23:25:46 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 13:35:10 -0200 |
| commit | 6827709a6148a6e8530d90027b4f31aa0aaa5ae5 (patch) | |
| tree | cfd608e91a0ec6f5138746091d998759b3938ac3 /drivers/media | |
| parent | 62d50addf0774115adaa9e01e09099c3d7daa13d (diff) | |
| download | linux-6827709a6148a6e8530d90027b4f31aa0aaa5ae5.tar.gz | |
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')
| -rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/ttusb-dec/ttusb_dec.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index ea4257653318..086458ed36b0 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c @@ -29,8 +29,6 @@ * the project's page is at http://www.linuxtv.org/dvb/ */ -#include "budget.h" - #include <linux/module.h> #include <linux/errno.h> #include <linux/slab.h> @@ -39,6 +37,8 @@ #include <linux/spinlock.h> #include <media/ir-common.h> +#include "budget.h" + #include "dvb_ca_en50221.h" #include "stv0299.h" #include "stv0297.h" 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 @@ * */ -#include <linux/mutex.h> - #include <linux/list.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -35,6 +33,8 @@ #include <linux/init.h> #include <linux/input.h> +#include <linux/mutex.h> + #include "dmxdev.h" #include "dvb_demux.h" #include "dvb_filter.h" |