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>
This commit is contained in:
Trent Piepho 2007-01-30 23:25:46 -03:00 committed by Mauro Carvalho Chehab
parent 62d50addf0
commit 6827709a61
2 changed files with 4 additions and 4 deletions

View File

@ -29,8 +29,6 @@
* the project's page is at http://www.linuxtv.org/dvb/ * the project's page is at http://www.linuxtv.org/dvb/
*/ */
#include "budget.h"
#include <linux/module.h> #include <linux/module.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -39,6 +37,8 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <media/ir-common.h> #include <media/ir-common.h>
#include "budget.h"
#include "dvb_ca_en50221.h" #include "dvb_ca_en50221.h"
#include "stv0299.h" #include "stv0299.h"
#include "stv0297.h" #include "stv0297.h"

View File

@ -20,8 +20,6 @@
* *
*/ */
#include <linux/mutex.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
@ -35,6 +33,8 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/input.h> #include <linux/input.h>
#include <linux/mutex.h>
#include "dmxdev.h" #include "dmxdev.h"
#include "dvb_demux.h" #include "dvb_demux.h"
#include "dvb_filter.h" #include "dvb_filter.h"