diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:13:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:13:39 -0800 |
commit | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (patch) | |
tree | 1a83f7d019b134d3c9581e7796eb98feab98f36c /drivers/media/dvb/frontends/Makefile | |
parent | [PATCH] cciss: softirq handler needs to save interrupt flags (diff) | |
parent | Merge branch 'work-fixes' (diff) | |
download | linux-dev-ce4b50f2fc62267eeaf331c41bc11b92d9bc7865.tar.xz linux-dev-ce4b50f2fc62267eeaf331c41bc11b92d9bc7865.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/dvb/frontends/Makefile')
-rw-r--r-- | drivers/media/dvb/frontends/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/Makefile b/drivers/media/dvb/frontends/Makefile index 615ec830e1c9..1af769cd90c0 100644 --- a/drivers/media/dvb/frontends/Makefile +++ b/drivers/media/dvb/frontends/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_DVB_CORE) += dvb-pll.o obj-$(CONFIG_DVB_STV0299) += stv0299.o obj-$(CONFIG_DVB_SP8870) += sp8870.o obj-$(CONFIG_DVB_CX22700) += cx22700.o -obj-$(CONFIG_DVB_ATMEL_AT76C651) += at76c651.o obj-$(CONFIG_DVB_CX24110) += cx24110.o obj-$(CONFIG_DVB_TDA8083) += tda8083.o obj-$(CONFIG_DVB_L64781) += l64781.o @@ -22,10 +21,8 @@ obj-$(CONFIG_DVB_SP887X) += sp887x.o obj-$(CONFIG_DVB_NXT6000) += nxt6000.o obj-$(CONFIG_DVB_MT352) += mt352.o obj-$(CONFIG_DVB_CX22702) += cx22702.o -obj-$(CONFIG_DVB_TDA80XX) += tda80xx.o obj-$(CONFIG_DVB_TDA10021) += tda10021.o obj-$(CONFIG_DVB_STV0297) += stv0297.o -obj-$(CONFIG_DVB_NXT2002) += nxt2002.o obj-$(CONFIG_DVB_NXT200X) += nxt200x.o obj-$(CONFIG_DVB_OR51211) += or51211.o obj-$(CONFIG_DVB_OR51132) += or51132.o |