Merge branches 'x86/xen', 'x86/build', 'x86/microcode', 'x86/mm-debug-v2', 'x86/memor...

[mv-sheeva.git] / drivers / media / Makefile

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index ec2102bcb282e20a721d917f65ae3ba91fdcaa62..09a829d8a7e71a4b7b0b5de035f7034d1748e82d 100644 (file)
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -6,4 +6,3 @@ obj-y += common/ video/
 
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
-obj-$(CONFIG_MDTV_ADAPTERS)  += mdtv/
\ No newline at end of file