diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-12 00:38:33 -0200 |
| commit | c30e05a83632aeb144f9d3912d39162564244a34 (patch) | |
| tree | 9877e4ed4167591ccb709ffbee27d7766986dabb /linux/include | |
| parent | ba8e7e903d8aaa290f8528c1beba1284c1d33ddf (diff) | |
| parent | e2b3b766697ca509f1281178161156ab8df5b0d5 (diff) | |
| download | mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.gz mediapointer-dvb-s2-c30e05a83632aeb144f9d3912d39162564244a34.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/oxford2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/tuner.h | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index d49392d90..97be269af 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -24,8 +24,6 @@ #include <linux/videodev2.h> -extern int tuner_debug; - #define ADDR_UNSET (255) #define TUNER_TEMIC_PAL 0 /* 4002 FH5 (3X 7756, 9483) */ diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h index 726120399..09e5f8de5 100644 --- a/linux/include/media/v4l2-i2c-drv.h +++ b/linux/include/media/v4l2-i2c-drv.h @@ -38,7 +38,6 @@ struct v4l2_i2c_driver_data { }; static struct v4l2_i2c_driver_data v4l2_i2c_data; -static struct i2c_client_address_data addr_data; static struct i2c_driver v4l2_i2c_driver; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22) @@ -59,6 +58,8 @@ static int __init v4l2_i2c_drv_init(void) #else +static struct i2c_client_address_data addr_data; + /* Bus-based I2C API is not present, add legacy code */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) |