summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-11-08 17:46:27 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-11-08 17:46:27 +0000
commit5bdb85f27e5b63366e61f242338a49a7a7145e1f (patch)
treef4b43af3d9dc77bbf63646196777b6831ddcb03d /v4l
parent82755cbf863840abd5bc0b9399bcfd023f26414c (diff)
downloadmediapointer-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>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog9
-rw-r--r--v4l/compat.h12
2 files changed, 20 insertions, 1 deletions
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: