diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 17:39:01 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-15 17:39:01 -0300 |
| commit | 860f43664b728edbd09625faf68b6277e4342969 (patch) | |
| tree | 5cf7fcb86b65b0fe5708b5e17acf015b028fbdbe /v4l | |
| parent | 0bc7aa319880a5596aa90e1a4b27e6b126856998 (diff) | |
| parent | 8680b10925d064efcd02c81c40c48e0c611e6d54 (diff) | |
| download | mediapointer-dvb-s2-860f43664b728edbd09625faf68b6277e4342969.tar.gz mediapointer-dvb-s2-860f43664b728edbd09625faf68b6277e4342969.tar.bz2 | |
Merging mchehab saa7115 tree
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/Make.config | 1 | ||||
| -rw-r--r-- | v4l/Makefile | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/v4l/Make.config b/v4l/Make.config index 65bc8dfea..89a4f0050 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -9,7 +9,6 @@ CONFIG_VIDEO_TVAUDIO := m CONFIG_VIDEO_CX88 := m CONFIG_TVP5150 := m -CONFIG_SAA711X := m #enable experimental support for xc3028 tuner CONFIG_XC3028 := m diff --git a/v4l/Makefile b/v4l/Makefile index a81db15c9..f04195162 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -97,7 +97,6 @@ obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o obj-$(CONFIG_VIDEO_CX88_IVTV) += cx88-ivtv.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 bt832.o @@ -314,7 +313,7 @@ ifeq ($(CONFIG_VIDEO_DEV),m) inst_video += videodev.ko endif inst_video += ir-kbd-i2c.ko msp3400.ko -inst_video += tvp5150.ko saa711x.ko saa7134-alsa.ko saa7134-oss.ko +inst_video += tvp5150.ko saa7134-alsa.ko saa7134-oss.ko inst_video += saa7115.ko cx25840.ko saa7127.ko compat_ioctl32.ko inst_cx88 := cx88xx.ko cx8800.ko cx8802.ko cx88-alsa.ko cx88-dvb.ko inst_cx88 += cx88-blackbird.ko cx88-vp3054-i2c.ko cx88-ivtv.ko |