diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 28 | ||||
| -rw-r--r-- | v4l/Makefile | 6 |
2 files changed, 31 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 46394322e..33406ee88 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,31 @@ +2005-11-09 03:25 rmcc + + * ../linux/drivers/media/video/saa7134/Makefile: + * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: + (saa7134_alsa_irq), (snd_card_saa7134_capture_trigger), + (dsp_buffer_init), (snd_card_saa7134_capture_prepare), + (snd_card_saa7134_capture_pointer), + (snd_card_saa7134_capture_close), (snd_card_saa7134_capture_open), + (snd_saa7134_capsrc_put), (snd_saa7134_dev_free), + (alsa_card_saa7134_create), (saa7134_alsa_init): + * ../linux/drivers/media/video/saa7134/saa7134-core.c: + (pending_call), (request_module_depend), (saa7134_irq), + (saa7134_hwinit1), (saa7134_hwfini), (saa7134_initdev), + (saa7134_finidev): + * ../linux/drivers/media/video/saa7134/saa7134-oss.c: (dsp_ioctl), + (mixer_ioctl), (saa7134_oss_irq), (saa7134_oss_init1), + (saa7134_irq_oss_done), (saa7134_dsp_create), (saa7134_oss_init), + (saa7134_oss_exit): + * ../linux/drivers/media/video/saa7134/saa7134.h: + * ../v4l/Makefile: + + - saa7134-oss is now a standalone module + - all DMA sound stuff has been removed from the core saa7134 module + - Lots of cleanups and variable renames to get some consistency + between OSS and ALSA drivers + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-11-09 02:57 mchehab * ../linux/drivers/media/video/Kconfig: diff --git a/v4l/Makefile b/v4l/Makefile index 7405d0302..d09cca210 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -18,7 +18,7 @@ export-objs += saa7134-core.o saa7134-tvaudio.o bttv-objs := bttv-driver.o bttv-cards.o bttv-risc.o bttv-if.o \ bttv-vbi.o bttv-i2c.o saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ - saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \ + saa7134-vbi.o saa7134-tvaudio.o \ saa7134-cards.o saa7134-ts.o saa7134-input.o @@ -50,7 +50,7 @@ ifeq ($(CONFIG_VIDEO_ALSA),m) endif obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa7134-empress.o saa6752hs.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o +obj-$(CONFIG_VIDEO_SAA7134) += saa7134-alsa.o 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 \ @@ -165,7 +165,7 @@ inst_video := btcx-risc.ko bttv.ko tda9887.ko tuner.ko tvaudio.ko tveeprom.ko sa inst_video += tvmixer.ko v4l1-compat.ko v4l2-common.ko wm8775.ko cs53l32a.ko inst_video += video-buf.ko video-buf-dvb.ko inst_video += ir-kbd-gpio.ko ir-kbd-i2c.ko msp3400.ko -inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko +inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko inst_cx88 := cx8800.ko cx8802.ko cx88-alsa.ko inst_cx88 += cx88-blackbird.ko cx88xx.ko cx88-dvb.ko inst_saa7134 := saa6752hs.ko saa7134.ko saa7134-empress.ko saa7134-dvb.ko |