diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/Make.config | 2 | ||||
| -rw-r--r-- | v4l/Makefile | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 260846104..bfb19ec20 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-11-29 13:36 mkrufky + + * ../v4l/Make.config: + * ../v4l/Makefile: + - DST cannot be built separately from DVB-BT8XX + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-11-28 15:42 mcisely * ../linux/drivers/media/video/tveeprom.c: diff --git a/v4l/Make.config b/v4l/Make.config index 2a6edf57c..32dfa69b1 100644 --- a/v4l/Make.config +++ b/v4l/Make.config @@ -26,7 +26,6 @@ CONFIG_VIDEO_SAA7134_DVB := n # requires merged v4l/dvb tree CONFIG_DVB_BT8XX := n -CONFIG_DVB_BT8XX_DST := n CONFIG_DVB_FRONTENDS := n CONFIG_DVB_CORE := n CONFIG_DVB_B2C2_FLEXCOP := n @@ -63,7 +62,6 @@ ifeq ($(CONFIG_VIDEO_BUF_DVB),m) CONFIG_VIDEO_CX88_DVB := m CONFIG_VIDEO_SAA7134_DVB := m CONFIG_DVB_BT8XX := m - CONFIG_DVB_BT8XX_DST := m CONFIG_DVB_FRONTENDS := m CONFIG_DVB_CORE := m CONFIG_DVB_B2C2_FLEXCOP := m diff --git a/v4l/Makefile b/v4l/Makefile index 7fc236897..8fab9f7dd 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -85,8 +85,7 @@ obj-$(CONFIG_VIDEO_TVAUDIO) += msp3400.o tvaudio.o tvmixer.o wm8775.o \ obj-$(CONFIG_VIDEO_CX88_DVB) += video-buf-dvb.o cx88-dvb.o obj-$(CONFIG_VIDEO_SAA7134_DVB) += video-buf-dvb.o saa7134-dvb.o -obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o -obj-$(CONFIG_DVB_BT8XX_DST) += dst.o dst_ca.o +obj-$(CONFIG_DVB_BT8XX) += bt878.o dvb-bt8xx.o dst.o dst_ca.o obj-$(CONFIG_DVB_FRONTENDS) += dvb-pll.o cx22702.o or51132.o lgdt330x.o \ mt352.o tda1004x.o sp887x.o nxt6000.o \ cx24110.o or51211.o nxt200x.o cx24123.o \ @@ -237,10 +236,7 @@ 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 inst_em28xx := em28xx.ko -inst_bt8xx := bt878.ko dvb-bt8xx.ko -ifeq ($(CONFIG_DVB_BT8XX_DST),m) - inst_bt8xx += dst.ko dst_ca.ko -endif +inst_bt8xx := bt878.ko dvb-bt8xx.ko dst.ko dst_ca.ko inst_frontends := cx22702.ko dvb-pll.ko lgdt330x.ko or51132.ko tda1004x.ko inst_frontends += mt352.ko sp887x.ko nxt6000.ko cx24110.ko or51211.ko inst_frontends += nxt200x.ko cx24123.ko mt312.ko stv0299.ko nxt2002.ko |