summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog16
-rw-r--r--v4l/compat.h5
2 files changed, 19 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index a0132614d..810b0014f 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,19 @@
+2005-12-10 01:39 mchehab
+
+ * linux/drivers/media/video/compat_ioctl32.c:
+ * linux/drivers/media/video/cs53l32a.c:
+ * linux/drivers/media/video/msp3400.c:
+ * linux/drivers/media/video/saa7115.c:
+ * linux/drivers/media/video/saa711x.c:
+ * linux/drivers/media/video/saa7127.c:
+ * linux/drivers/media/video/saa7134/saa7134-oss.c:
+ (oss_device_exit):
+ * linux/drivers/media/video/wm8775.c:
+ * v4l/compat.h:
+ - make it compile against kernel 2.4.32
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-09 21:36 woods
* linux/drivers/media/dvb/ttusb-dec/ttusb_dec.c:
diff --git a/v4l/compat.h b/v4l/compat.h
index 85f179da3..67fc48824 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.41 2005/12/08 16:06:52 mkrufky Exp $
+ * $Id: compat.h,v 1.42 2005/12/10 01:43:26 mchehab Exp $
*/
#ifndef _COMPAT_H
@@ -10,7 +10,6 @@
#include <linux/version.h>
#include <linux/utsname.h>
#include <linux/sched.h>
-#include <linux/device.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18)
# define minor(x) MINOR(x)
@@ -21,6 +20,8 @@
# define need_resched() (current->need_resched)
#define work_struct tq_struct
+#else
+#include <linux/device.h>
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,19)