From 73a7e93c17ac10920d3ba34f5ecc3b51d0699aca Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 24 Aug 2012 19:44:44 -0300
Subject: [PATCH] --- yaml --- r: 330923 b: refs/heads/master c:
 1daae517b3a903177f79269c694c9a8fb4ddb0bb h: refs/heads/master i:   330921:
 a94dc7db4a5d877c80ab50ebe577fd719f90e4b6   330919:
 06b2b93ea85daab70a1ad9482964a87f7f7b7105 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/media/Makefile | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1f4cfc611b9d..b218125bc1f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79e8c7bebb467bbc3f2514d75bba669a3f354324
+refs/heads/master: 1daae517b3a903177f79269c694c9a8fb4ddb0bb
diff --git a/trunk/drivers/media/Makefile b/trunk/drivers/media/Makefile
index b0b0193cd69d..620f275a45c9 100644
--- a/trunk/drivers/media/Makefile
+++ b/trunk/drivers/media/Makefile
@@ -4,12 +4,30 @@
 
 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-y += tuners/ common/ rc/ platform/
-obj-y += i2c/ pci/ usb/ mmc/ firewire/ parport/
+obj-$(CONFIG_VIDEO_DEV) += v4l2-core/
+obj-$(CONFIG_DVB_CORE)  += dvb-core/
+
+# 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_VIDEO_DEV) += radio/ v4l2-core/
-obj-$(CONFIG_DVB_CORE)  += dvb-core/ dvb-frontends/