diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/.bp/2.6/v4l-driver-doc | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 23 | ||||
| -rw-r--r-- | v4l/Make.config | 4 | ||||
| -rw-r--r-- | v4l/Makefile | 7 |
4 files changed, 34 insertions, 6 deletions
diff --git a/v4l/.bp/2.6/v4l-driver-doc b/v4l/.bp/2.6/v4l-driver-doc index 64e89710c..0bc362fdc 100644 --- a/v4l/.bp/2.6/v4l-driver-doc +++ b/v4l/.bp/2.6/v4l-driver-doc @@ -21,9 +21,9 @@ srcdiff doc/CARDLIST.tuner Documentation/video4linux/CARDLIST.tuner srcdiff doc/CARDLIST.cx88 Documentation/video4linux/CARDLIST.cx88 # API -srcdiff /dev/null Docummentation/video4linux/API.html -srcdiff doc/V4L1_API.html Docummentation/video4linux/V4L1_API.html -srcdiff doc/V4L2_API.html Docummentation/video4linux/V4L2_API.html +srcdiff /dev/null Documentation/video4linux/API.html +srcdiff doc/V4L1_API.html Documentation/video4linux/V4L1_API.html +srcdiff doc/V4L2_API.html Documentation/video4linux/V4L2_API.html # obsolete / fixme #srcdiff doc/Specs Documentation/video4linux/bttv/Specs diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 92ffec52a..db9e74626 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,24 @@ +2005-06-15 02:14 mchehab + * Make.config, Makefile, tuner-core.c: + + - CONFIG_TUNER_MULTI_I2C dropped from tuner-core.c and included on Make.config + - included CONFIG_USE_I2C_RANGE for kernels that requires normal_i2c_range struct + (only kernels after 2.6.12-rc6-mm1 doesn't require). + + * bt832.c, msp3400.c, saa6752hs.c, tda7432.c, tda9875.c, tda9887.c, tuner-core.c,tvaudio.c, + tveeprom.c, + + - I2C range detection corrected to new behavior of 2.6.12-rc6-mm1 + + * cx88-video.c, tea5767, tuner-core.c: + + - V4L2_TUNER_CAP_LOW implemented according with V4L2 API for Radio. + - tea5767 debug improved. + + * .bp/2.6/v4l-driver-doc + + - typo corrected. + 2005-06-14 04:08 Hartmut Hackmann * saa7134-cards.c saa7134.h - added entry for Philips TOUGH Reference design @@ -77,7 +98,6 @@ - Updated entry for Avermedia Cardbus E500. Thanks to Kees Blom <Kees.Blom@cwi.nl>. ->>>>>>> 1.42 2005-06-12 04:08 mchehab * audiochip.h, compat.h, cx22702.h, cx88-core.c, cx88-dvb.c, cx88-i2c.c, cx88-vbi.c, cx88-video.c, dpl3518.c, dpl3518.h, @@ -266,7 +286,6 @@ Thanks to Catalin Climov <catalin@climov.com> ->>>>>>> 1.19 2005-06-03 12:33 mchehab * cx88-cards.c, cx88.h, CARDLIST.cx88, CARDLIST.tuner, tuner-simple.c: diff --git a/v4l/Make.config b/v4l/Make.config index 004d49ae5..d8d663e61 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -7,6 +7,8 @@ CONFIG_VIDEO_IR := m CONFIG_VIDEO_TUNER := m CONFIG_VIDEO_TVAUDIO := m CONFIG_VIDEO_CX88 := m +CONFIG_TUNER_MULTI_I2C := y +CONFIG_USE_I2C_RANGE := y # doesn't build on kernels older than 2.6.10 # Hmm, need a more clever check once we have 2.6.11 ... @@ -20,3 +22,5 @@ ifeq ($(SUBLEVEL),11) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m endif + + diff --git a/v4l/Makefile b/v4l/Makefile index ea4e3ca0c..8bbaeaa1e 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -59,7 +59,12 @@ EXTRA_CFLAGS += -I$(srctree)/drivers/media/dvb/frontends/ ifeq ($(CONFIG_VIDEO_CX88_DVB),m) EXTRA_CFLAGS += -DCONFIG_VIDEO_CX88_DVB_MODULE=1 endif - +ifeq ($(CONFIG_TUNER_MULTI_I2C),y) + EXTRA_CFLAGS += -DCONFIG_TUNER_MULTI_I2C=1 +endif +ifeq ($(CONFIG_USE_I2C_RANGE),y) + EXTRA_CFLAGS += -DCONFIG_USE_I2C_RANGE=1 +endif ################################################# # compile modules |