summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/ChangeLog13
-rw-r--r--v4l/compat.h8
2 files changed, 20 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 9ba7a7683..174d872f4 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,16 @@
+2005-09-19 01:11 mkrufky
+
+ * saa6588.c: (saa6588_probe):
+ - fix build for 2.6.14
+
+ * compat.h:
+ * ir-kbd-i2c.c: (ir_probe):
+ * saa7134-i2c.c:
+ * tvaudio.c: (chip_probe):
+ - removed some #if kernel version > 2.6.13 ... using compat.h instead.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-09-16 20:24 mchehab
* bttv-cards.c:
diff --git a/v4l/compat.h b/v4l/compat.h
index 6e743935e..505031f12 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -1,5 +1,5 @@
/*
- * $Id: compat.h,v 1.17 2005/09/08 22:19:56 nsh Exp $
+ * $Id: compat.h,v 1.18 2005/09/19 01:20:14 mkrufky Exp $
*/
#ifndef _COMPAT_H
@@ -56,6 +56,12 @@
#if !defined(I2C_HW_B_CX2388x)
# define I2C_HW_B_CX2388x I2C_HW_B_BT848
#endif
+#if !defined(I2C_HW_SAA7134)
+# define I2C_HW_SAA7134 I2C_ALGO_SAA7134
+#endif
+#if !defined(I2C_HW_SAA7146)
+# define I2C_HW_SAA7146 I2C_ALGO_SAA7146
+#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)
#define __le32 __u32