summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/ChangeLog8
-rw-r--r--v4l_experimental/v3tv/vpx3224.c3
2 files changed, 9 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index d3672583a..da31859de 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-25 16:43 mkrufky
+
+ * v4l_experimental/v3tv/vpx3224.c:
+ - fix build for 2.6.14, based on:
+ http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9fc6adfa9adf2be84119a3c2592287f33bd1dff2
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-25 16:33 mkrufky
* v4l_experimental/v3tv/vpx3224-proc.c: (vpx3224_partnum),
diff --git a/v4l_experimental/v3tv/vpx3224.c b/v4l_experimental/v3tv/vpx3224.c
index 76a7b152a..5e4a10694 100644
--- a/v4l_experimental/v3tv/vpx3224.c
+++ b/v4l_experimental/v3tv/vpx3224.c
@@ -1060,7 +1060,7 @@ static unsigned short probe[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
// static unsigned short probe_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static unsigned short ignore[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
// static unsigned short ignore_range[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
-static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
+// static unsigned short force[2] = { I2C_CLIENT_END, I2C_CLIENT_END };
static struct i2c_client_address_data addr_data = {
.normal_i2c = normal_i2c,
@@ -1069,7 +1069,6 @@ static struct i2c_client_address_data addr_data = {
// .probe_range = probe_range,
.ignore = ignore,
// .ignore_range = ignore_range,
- .force = force
};
/* Maintain a count of registered clients */