diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
| commit | 6807eba35cc91e109fed1df6038c424496cf2add (patch) | |
| tree | 475351eb821b9e5a741faa5ba2f97e27cbf2e857 /v4l | |
| parent | 1faa3dcb3917ba99177697e1b8b4473e388744f8 (diff) | |
| download | mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.gz mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.bz2 | |
Several i2C cleanups to compile on both current linux and kernels >2.6.15
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 31 | ||||
| -rw-r--r-- | v4l/Makefile | 4 | ||||
| -rw-r--r-- | v4l/scripts/gentree.pl | 8 |
3 files changed, 41 insertions, 2 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 408731e6f..3914a6923 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,34 @@ +2006-01-09 17:12 mchehab + + * linux/drivers/media/dvb/cinergyT2/cinergyT2.c: + * linux/drivers/media/dvb/ttpci/budget.h: + * linux/drivers/media/video/bt832.c: (bt832_attach), + (bt832_detach), (bt832_command): + * linux/drivers/media/video/bttv-i2c.c: + * linux/drivers/media/video/cx88/Kconfig: + * linux/drivers/media/video/tda7432.c: (tda7432_attach), + (tda7432_command), (tda7432_init): + * linux/drivers/media/video/tuner-core.c: + * linux/drivers/media/video/tvp5150.c: + * linux/include/linux/i2c-id.h: + * linux/include/media/saa7146.h: + - Several i2C cleanups to compile on both current linux + and kernels >2.6.15 + + * linux/drivers/media/video/tda9875.c: (tda9875_write), + (i2c_read_register), (tda9875_set), (do_tda9875_init), + (tda9875_checkit), (tda9875_attach), (tda9875_command): + - Old patch reverted since it uses a different way to + call i2c functions. + + * v4l/Makefile: + - Making compile bt832, tda9732 and tda9875 + + * v4l/scripts/gentree.pl: + Some fixes to remove unnecessary ifs at kernel + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2006-01-09 16:24 mkrufky * linux/Documentation/dvb/get_dvb_firmware: diff --git a/v4l/Makefile b/v4l/Makefile index 041ffd11f..a29aae6db 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -75,7 +75,7 @@ obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ obj-$(CONFIG_TVP5150) += tvp5150.o obj-$(CONFIG_SAA711X) += saa711x.o obj-$(CONFIG_EM28XX) += em28xx.o tveeprom.o -obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o +obj-$(CONFIG_VIDEO_DECODER) += saa7115.o cx25840.o saa7127.o bt832.o ifeq ($(CONFIG_VIDEO_ALSA),y) EXTRA_CFLAGS += -DUSING_CX88_ALSA=1 @@ -90,7 +90,7 @@ obj-$(CONFIG_VIDEO_SAA7134) += saa7134-oss.o obj-$(CONFIG_VIDEO_IR) += ir-common.o obj-$(CONFIG_VIDEO_TUNER) += tuner.o tda9887.o saa6588.o obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ - cs53l32a.o + cs53l32a.o tda7432.o tda9875.o obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o cx88-vp3054-i2c.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o diff --git a/v4l/scripts/gentree.pl b/v4l/scripts/gentree.pl index c67489d2c..4885b08ad 100644 --- a/v4l/scripts/gentree.pl +++ b/v4l/scripts/gentree.pl @@ -130,6 +130,14 @@ sub filter_source ($$) { $level++; next; } + if ($line =~ /^#ifndef.\s*I2C_DF_DUMMY/) { + chomp($line); + $state{$level} = "if"; + $if{$level} = 1; + print STDERR "/* BP #if 1 state=$state{$level} if=$if{$level} level=$level ($line) */\n" if $DEBUG; + $level++; + next; + } if ($line =~ /^#if.*I2C_CLASS_TV_DIGITAL/) { chomp($line); $state{$level} = "if"; |