diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-11-07 02:33:06 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-11-07 02:33:06 +0000 |
| commit | 52412b6a13eca8fcc37a1b3a0b90bd80c8847333 (patch) | |
| tree | 4958dd2cfea5eb67fd3b44d475c0d8bb1b6805c6 /v4l | |
| parent | f026de95c19d86e1ba396cb15e0990ac89a35e23 (diff) | |
| download | mediapointer-dvb-s2-52412b6a13eca8fcc37a1b3a0b90bd80c8847333.tar.gz mediapointer-dvb-s2-52412b6a13eca8fcc37a1b3a0b90bd80c8847333.tar.bz2 | |
- saa7134-alsa is now a standalone module
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 16 | ||||
| -rw-r--r-- | v4l/Makefile | 9 |
2 files changed, 22 insertions, 3 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 25ffede2f..9f49b3c73 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,19 @@ +2005-11-07 02:28 rmcc + + * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: + (saa7134_irq_alsa_done), (saa7134_alsa_irq), + (snd_saa7134_capsrc_put), (alsa_card_saa7134_create), + (saa7134_alsa_init), (saa7134_alsa_exit): + * ../linux/drivers/media/video/saa7134/saa7134-core.c: + (saa7134_irq), (saa7134_initdev), (saa7134_finidev): + * ../linux/drivers/media/video/saa7134/saa7134-tvaudio.c: + * ../linux/drivers/media/video/saa7134/saa7134.h: + * ../v4l/Makefile: + + - saa7134-alsa is now a standalone module + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-11-06 20:39 mchehab * ../v4l/Make.config: diff --git a/v4l/Makefile b/v4l/Makefile index 9d586fd04..f851674e7 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -12,14 +12,16 @@ export-objs := video-buf.o v4l1-compat.o v4l2-common.o export-objs += ir-common.o export-objs += bttv-if.o btcx-risc.o export-objs += cx88-cards.o cx88-core.o +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 saa7134-objs := saa7134-core.o saa7134-i2c.o saa7134-video.o \ saa7134-vbi.o saa7134-tvaudio.o saa7134-oss.o \ - saa7134-cards.o saa7134-ts.o saa7134-input.o \ - saa7134-alsa.o + saa7134-cards.o saa7134-ts.o saa7134-input.o + + cx88xx-objs := cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \ cx88-input.o cx8800-objs := cx88-video.o cx88-vbi.o @@ -45,6 +47,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_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 \ @@ -159,7 +162,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 +inst_video += tvp5150.ko saa711x.ko saa7134-alsa.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 |