diff options
| author | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-08 17:46:27 +0000 |
|---|---|---|
| committer | Nickolay V. Shmyrev <devnull@localhost> | 2005-11-08 17:46:27 +0000 |
| commit | 5bdb85f27e5b63366e61f242338a49a7a7145e1f (patch) | |
| tree | f4b43af3d9dc77bbf63646196777b6831ddcb03d | |
| parent | 82755cbf863840abd5bc0b9399bcfd023f26414c (diff) | |
| download | mediapointer-dvb-s2-5bdb85f27e5b63366e61f242338a49a7a7145e1f.tar.gz mediapointer-dvb-s2-5bdb85f27e5b63366e61f242338a49a7a7145e1f.tar.bz2 | |
* ../linux/drivers/media/video/saa7134/saa7134-alsa.c:
* ../v4l/compat.h:
Fix compilation with older kernels.
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 3 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 | ||||
| -rw-r--r-- | v4l/compat.h | 12 |
3 files changed, 22 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index dd8317619..f343d9ac9 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -1,7 +1,7 @@ /* * SAA713x ALSA support for V4L * - * $Id: saa7134-alsa.c,v 1.18 2005/11/08 13:30:07 rmcc Exp $ + * $Id: saa7134-alsa.c,v 1.19 2005/11/08 17:46:27 nsh Exp $ * * Caveats: * - Volume doesn't work (it's always at max) @@ -34,6 +34,7 @@ #include <sound/control.h> #include <sound/pcm.h> #include <sound/initval.h> +#include <linux/interrupt.h> #include "saa7134.h" #include "saa7134-reg.h" diff --git a/v4l/ChangeLog b/v4l/ChangeLog index e073fd729..b887f0c8d 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-08 17:46 nshmyrev + + * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: + * ../v4l/compat.h: + + Fix compilation with older kernels. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-11-08 16:48 nshmyrev * ../linux/Documentation/video4linux/CARDLIST.bttv: diff --git a/v4l/compat.h b/v4l/compat.h index 01d0c0635..d13fe010c 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.29 2005/11/06 17:01:47 mchehab Exp $ + * $Id: compat.h,v 1.30 2005/11/08 17:46:27 nsh Exp $ */ #ifndef _COMPAT_H @@ -235,6 +235,16 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) }) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +#define kzalloc(size, flags) \ +({ \ + void *__ret = kmalloc(size, flags); \ + if (__ret) \ + memset(__ret, 0, size); \ + __ret; \ +}) +#endif + #endif /* * Local variables: |