diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/media/common/Makefile | |
parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
download | linux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.xz |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 97b4341255ea..bd458cb9b4ea 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1,5 +1,5 @@ -saa7146-objs := saa7146_i2c.o saa7146_core.o -saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o +saa7146-objs := saa7146_i2c.o saa7146_core.o +saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o |