Patched in Tegra support.

1 files changed, 2 insertions, 21 deletions

diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 620f275a45c..64755c99ded 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -4,30 +4,11 @@
 
 media-objs      := media-device.o media-devnode.o media-entity.o
 
-#
-# I2C drivers should come before other drivers, otherwise they'll fail
-# when compiled as builtin drivers
-#
-obj-y += i2c/ tuners/
-obj-$(CONFIG_DVB_CORE)  += dvb-frontends/
-
-#
-# Now, let's link-in the media core
-#
 ifeq ($(CONFIG_MEDIA_CONTROLLER),y)
   obj-$(CONFIG_MEDIA_SUPPORT) += media.o
 endif
 
-obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
-obj-$(CONFIG_DVB_CORE)  += dvb-core/
+obj-y += common/ rc/ video/
 
-# There are both core and drivers at RC subtree - merge before drivers
-obj-y += rc/
-
-#
-# Finally, merge the drivers that require the core
-#
-
-obj-y += common/ platform/ pci/ usb/ mmc/ firewire/ parport/
 obj-$(CONFIG_VIDEO_DEV) += radio/
-
+obj-$(CONFIG_DVB_CORE)  += dvb/