diff options
| author | Michael Krufky <devnull@localhost> | 2005-12-08 12:38:00 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2005-12-08 12:38:00 +0000 |
| commit | 8f7f600bfe1894c7566187270b37efc04a536454 (patch) | |
| tree | 1f131329a28a63f6f94b6fd75303b4c0a77cf2de /v4l | |
| parent | 4709e77e139f5767573acf898d1886494eea2737 (diff) | |
| download | mediapointer-dvb-s2-8f7f600bfe1894c7566187270b37efc04a536454.tar.gz mediapointer-dvb-s2-8f7f600bfe1894c7566187270b37efc04a536454.tar.bz2 | |
fixed backwards compatability for non-vanilla 2.6.14 kernels.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/compat.h | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index d0a9264d3..807d7ca01 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-12-08 12:37 mkrufky + + * v4l/compat.h: + - fixed backwards compatability for non-vanilla 2.6.14 kernels. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-12-08 12:31 mchehab * linux/drivers/media/video/btcx-risc.c: diff --git a/v4l/compat.h b/v4l/compat.h index b6b4e82dc..b8204f7dc 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.37 2005/12/04 01:12:43 rmcc Exp $ + * $Id: compat.h,v 1.38 2005/12/08 12:38:00 mkrufky Exp $ */ #ifndef _COMPAT_H @@ -262,9 +262,11 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #endif #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) -# define input_allocate_device() kzalloc(sizeof(struct input_dev),GFP_KERNEL); -# define input_free_device(input_dev) kfree(input_dev) +#ifndef input_allocate_device +# define input_allocate_device() kzalloc(sizeof(struct input_dev),GFP_KERNEL); +#endif +#ifndef input_free_device +# define input_free_device(input_dev) kfree(input_dev) #endif #endif |