diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 01:46:20 -0500 |
commit | 80c7af4074cbb4cb6be5d35c443ea6d5e8838a84 (patch) | |
tree | e900ad4c0beb4f44f0912b847c3319f11ef57d73 /drivers/media/common/Makefile | |
parent | 451ec6ab310602515b361418debe93d00f67e273 (diff) | |
parent | d00d598ffbba974d9045ba8b95296655fe2162c5 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'drivers/media/common/Makefile')
-rw-r--r-- | drivers/media/common/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 97b4341255e..bd458cb9b4e 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | saa7146-objs := saa7146_i2c.o saa7146_core.o | 1 | saa7146-objs := saa7146_i2c.o saa7146_core.o |
2 | saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o | 2 | saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o |
3 | 3 | ||
4 | obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o | 4 | obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o |
5 | obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o | 5 | obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o |