diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 11:26:34 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 11:26:34 +0300 |
| commit | 1cb4f624ea38361b6397966470f0a1bed5532483 (patch) | |
| tree | 418b05ddc854b09d64f7d5ee0c78875e42b5f151 /drivers/media/common/Makefile | |
| parent | 444c1953d496d272208902ff7010dc70d1f887f0 (diff) | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| download | linux-1cb4f624ea38361b6397966470f0a1bed5532483.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes
Diffstat (limited to 'drivers/media/common/Makefile')
| -rw-r--r-- | drivers/media/common/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 169b337b7c9d..e3ec9639321b 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile @@ -1,8 +1,6 @@ saa7146-objs := saa7146_i2c.o saa7146_core.o saa7146_vv-objs := saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o -ir-common-objs := ir-functions.o ir-keymaps.o ir-keytable.o obj-y += tuners/ obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o -obj-$(CONFIG_VIDEO_IR) += ir-common.o |