summaryrefslogtreecommitdiff
path: root/drivers/media/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 09:56:29 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-17 09:56:29 -0800
commitea9e7b5569a538123dc4d60ba36b9170ca8e8830 (patch)
tree138de44791101f83193df5733f98f0117805d139 /drivers/media/Makefile
parent980110c5da56cb56d3356f5a5251fdc920f83ba6 (diff)
parent2300317f30770abd625fb051b0e5d373ce55a6ad (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (6820): s5h1409: QAM SNR related fixes V4L/DVB (6819): i2c: fix drivers/media/video/bt866.c V4L/DVB (6814): Makefile: always enter video/ V4L/DVB (6798): saa7134: enable LNA in analog mode for Hauppauge WinTV HVR-1110 V4L/DVB (6803): buf-core.c locking fixes
Diffstat (limited to 'drivers/media/Makefile')
-rw-r--r--drivers/media/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 8fa19939c2b6..8cf91353b56a 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -3,6 +3,6 @@
#
obj-y := common/
-obj-$(CONFIG_VIDEO_DEV) += video/
+obj-y += video/
obj-$(CONFIG_VIDEO_DEV) += radio/
obj-$(CONFIG_DVB_CORE) += dvb/