diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-12-10 17:51:31 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-12-10 17:51:31 +0000 |
| commit | 8b3be7709f039bc44be8053681f2e94cae69d5db (patch) | |
| tree | 52152b8419df847a5039f19e61aa7da84ede2852 /v4l | |
| parent | e16ce4ced092fb2227e41ae9773a1c5b3e7ca5fd (diff) | |
| download | mediapointer-dvb-s2-8b3be7709f039bc44be8053681f2e94cae69d5db.tar.gz mediapointer-dvb-s2-8b3be7709f039bc44be8053681f2e94cae69d5db.tar.bz2 | |
ir-kbd-gpio is now part of bttv
From: Ricardo Cerqueira <v4l@cerqueira.org>
Merged ir-kbd-gpio into bttv as bttv-input, for consistency with other
input modules
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 22 | ||||
| -rw-r--r-- | v4l/Makefile | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 9e88b439a..20da0f6e0 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,25 @@ +2005-12-10 17:44 rmcc + + * linux/drivers/media/video/Makefile: + * linux/drivers/media/video/bttv-cards.c: (bttv_init_card2): + * linux/drivers/media/video/bttv-driver.c: (bttv_irq): + * linux/drivers/media/video/bttv-gpio.c: + * linux/drivers/media/video/bttv-input.c: (ir_handle_key), + (bttv_input_irq), (bttv_input_timer), (rc5_decode), (bttv_rc5_irq), + (bttv_rc5_timer_end), (bttv_rc5_timer_keyup), (bttv_input_init), + (bttv_input_fini): + * linux/drivers/media/video/bttv.h: + * linux/drivers/media/video/bttvp.h: + * linux/drivers/media/video/ir-kbd-gpio.c: + * v4l/Makefile: + * v4l_experimental/bttv-input/bttv-input.c: + * v4l_experimental/bttv-input/bttv-input.diff: + + - ir-kbd-gpio functionally has been merged into the main bttv module + - Terminated experimental bttv-input + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-12-10 14:39 mchehab * linux/drivers/media/video/tveeprom.c: diff --git a/v4l/Makefile b/v4l/Makefile index d20bab383..7c02ead22 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -16,7 +16,7 @@ export-objs += saa7134-core.o saa7134-tvaudio.o # drivers objects bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ - bttv-vbi.o bttv-i2c.o + bttv-vbi.o bttv-i2c.o bttv-input.o saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o \ saa7134-cards.o saa7134-ts.o saa7134-input.o @@ -130,7 +130,7 @@ obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o ifeq ($(VERSION).$(PATCHLEVEL),2.6) ifeq ($(CONFIG_VIDEO_BTTV),m) bttv-objs += bttv-gpio.o - obj-$(CONFIG_VIDEO_IR) += ir-kbd-gpio.o ir-kbd-i2c.o + obj-$(CONFIG_VIDEO_IR) += ir-kbd-i2c.o endif ifeq ($(CONFIG_VIDEO_SAA7134),m) obj-$(CONFIG_VIDEO_IR) += ir-kbd-i2c.o @@ -244,7 +244,7 @@ inst_common := ir-common.ko inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko saa6588.ko inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko videodev.ko -inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko +inst_video += ir-kbd-i2c.ko msp3400.ko inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko |