aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/common/Makefile
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-12 15:30:15 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-12 15:30:15 -0500
commit20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch)
tree6888e6c6b8f2beef67b3f85570aebb853f8443f9 /drivers/media/common/Makefile
parent92f268e034faf793f6d40de2f0fc81478a14ff39 (diff)
parent49d7bc64283970ee83d2c954d04ba00d04e5943d (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/media/common/Makefile')
-rw-r--r--drivers/media/common/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile
index 97b4341255ea..bd458cb9b4ea 100644
--- a/drivers/media/common/Makefile
+++ b/drivers/media/common/Makefile
@@ -1,5 +1,5 @@
1saa7146-objs := saa7146_i2c.o saa7146_core.o 1saa7146-objs := saa7146_i2c.o saa7146_core.o
2saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o 2saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o
3 3
4obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o 4obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o
5obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o 5obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o