diff options
author | Michael Hunold <devnull@localhost> | 2003-01-09 10:27:22 +0000 |
---|---|---|
committer | Michael Hunold <devnull@localhost> | 2003-01-09 10:27:22 +0000 |
commit | 096166622785876bd4360f2cdb1495665ca03c6c (patch) | |
tree | 9a152955f0010e8dcb74aed11528d55f3c5747c6 /linux/drivers/media/video/tda9840.c | |
parent | d943bbf1e37291d4aa2aacd696898ae8a596bb1c (diff) | |
download | mediapointer-dvb-s2-096166622785876bd4360f2cdb1495665ca03c6c.tar.gz mediapointer-dvb-s2-096166622785876bd4360f2cdb1495665ca03c6c.tar.bz2 |
Fixes for 2.5.55 all over the place:
- removed the patches, they are not needed any more. you can now
use a vanilla 2.5.55 kernel
- created a new backport for video-buf and videodev from the 2.5.55
sources
- necessary fixes to the saa7146 driver due to changes in 2.5.55
- the core budget functions are now provided by a module called
"budget-core.o". (otherwise static compilation is not possible...)
- removed #ifdef MODULE crap from all files
Misc.
- "xawtv" (using xv extension) resulted in wrong colors. the problem
is within "xawtv". Gerd Knorr told me, that it'll be fixed in the
next release.
I tested this version with 2.4.20, 2.5.55 (modules) and 2.5.55
(static).
Diffstat (limited to 'linux/drivers/media/video/tda9840.c')
-rw-r--r-- | linux/drivers/media/video/tda9840.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c index 116b59f74..dfdf04968 100644 --- a/linux/drivers/media/video/tda9840.c +++ b/linux/drivers/media/video/tda9840.c @@ -1,3 +1,4 @@ +#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/poll.h> @@ -7,11 +8,8 @@ #include "tda9840.h" -#ifdef MODULE -MODULE_PARM(debug,"i"); -#endif - static int debug = 0; /* insmod parameter */ +MODULE_PARM(debug,"i"); #define dprintk if (debug) printk #define SWITCH 0x00 @@ -227,29 +225,16 @@ static int tda9840_detach(struct i2c_client *client) return 0; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) -static void tda9840_inc_use(struct i2c_client *client) -{ - MOD_INC_USE_COUNT; -} - -static void tda9840_dec_use(struct i2c_client *client) -{ - MOD_DEC_USE_COUNT; -} -#endif - static struct i2c_driver driver = { +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,54) + .owner = THIS_MODULE, +#endif .name = "tda9840 driver", .id = I2C_DRIVERID_TDA9840, .flags = I2C_DF_NOTIFY, .attach_adapter = tda9840_attach, .detach_client = tda9840_detach, .command = tda9840_command, -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51) - .inc_use = tda9840_inc_use, - .dec_use = tda9840_dec_use, -#endif }; static int tda9840_init_module(void) @@ -266,9 +251,7 @@ static void tda9840_cleanup_module(void) module_init(tda9840_init_module); module_exit(tda9840_cleanup_module); -#ifdef MODULE MODULE_AUTHOR("Michael Hunold <michael@mihu.de>"); MODULE_DESCRIPTION("tda9840 driver"); MODULE_LICENSE("GPL"); -#endif |