diff options
| author | Michael Krufky <devnull@localhost> | 2006-01-14 20:18:00 +0000 |
|---|---|---|
| committer | Michael Krufky <devnull@localhost> | 2006-01-14 20:18:00 +0000 |
| commit | 33a0cdc6392b4c4ae3b311bfd5ec8298f9117431 (patch) | |
| tree | 9c5a8030b97ea51d1d4e0d3f25717bb914fab528 | |
| parent | d994bb1e8067e27e458a8e741b57476171fa45d1 (diff) | |
| download | mediapointer-dvb-s2-33a0cdc6392b4c4ae3b311bfd5ec8298f9117431.tar.gz mediapointer-dvb-s2-33a0cdc6392b4c4ae3b311bfd5ec8298f9117431.tar.bz2 | |
2.6.12 backward-compat
From: Colin Guthrie <linuxtv@colin.guthr.ie>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
| -rw-r--r-- | linux/drivers/media/video/bt832.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda7432.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/tda9875.c | 2 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
4 files changed, 13 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt832.c b/linux/drivers/media/video/bt832.c index b77bd4ace..b155bbe91 100644 --- a/linux/drivers/media/video/bt832.c +++ b/linux/drivers/media/video/bt832.c @@ -45,10 +45,10 @@ MODULE_LICENSE("GPL"); /* Addresses to scan */ static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1, I2C_CLIENT_END }; -I2C_CLIENT_INSMOD; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif +I2C_CLIENT_INSMOD; int debug; /* debug output */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) diff --git a/linux/drivers/media/video/tda7432.c b/linux/drivers/media/video/tda7432.c index 30f7b34f2..4dc86710d 100644 --- a/linux/drivers/media/video/tda7432.c +++ b/linux/drivers/media/video/tda7432.c @@ -79,10 +79,10 @@ static unsigned short normal_i2c[] = { I2C_TDA7432 >> 1, I2C_CLIENT_END, }; -I2C_CLIENT_INSMOD; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif +I2C_CLIENT_INSMOD; /* Structure of address and subaddresses for the tda7432 */ diff --git a/linux/drivers/media/video/tda9875.c b/linux/drivers/media/video/tda9875.c index 83f29e7d3..8a566026d 100644 --- a/linux/drivers/media/video/tda9875.c +++ b/linux/drivers/media/video/tda9875.c @@ -50,10 +50,10 @@ static unsigned short normal_i2c[] = { I2C_TDA9875 >> 1, I2C_CLIENT_END }; -I2C_CLIENT_INSMOD; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif +I2C_CLIENT_INSMOD; /* This is a superset of the TDA9875 */ struct tda9875 { diff --git a/v4l/ChangeLog b/v4l/ChangeLog index a519780ed..65eed40a2 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2006-01-14 20:14 mkrufky + + * linux/drivers/media/video/bt832.c: + * linux/drivers/media/video/tda7432.c: + * linux/drivers/media/video/tda9875.c: + - fix 2.6.12 backward-compat + + Thanks-to: Colin Guthrie <linuxtv@colin.guthr.ie> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2006-01-14 20:08 mcisely * v4l_experimental/pvrusb2/pvrusb2-encoder.c: |