diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:25:46 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-01-30 18:25:46 -0800 |
| commit | fca7ef71fcb220fb867d2f6d7e2e691adfa51906 (patch) | |
| tree | e52871d1e273b53258c8c82969ebda47a9364c91 /linux/drivers/media/dvb/ttusb-dec | |
| parent | 0b945b64fba3381dfc97c66722fe76193f0008d3 (diff) | |
| download | mediapointer-dvb-s2-fca7ef71fcb220fb867d2f6d7e2e691adfa51906.tar.gz mediapointer-dvb-s2-fca7ef71fcb220fb867d2f6d7e2e691adfa51906.tar.bz2 | |
compat: Handle input_register_device() change and some others
From: Trent Piepho <xyzzy@speakeasy.org>
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>
Diffstat (limited to 'linux/drivers/media/dvb/ttusb-dec')
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c index b1598680d..74a710019 100644 --- a/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c @@ -20,11 +20,6 @@ * */ -#include "compat.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) -#include <linux/mutex.h> -#endif - #include <linux/list.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -38,6 +33,11 @@ #include <linux/init.h> #include <linux/input.h> +#include "compat.h" +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif + #include "dmxdev.h" #include "dvb_demux.h" #include "dvb_filter.h" |