diff --git a/[refs] b/[refs]
index d70df4b7804e..649fc27f302a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44538b431517ebf4b0e8574cb727deb1a73652c8
+refs/heads/master: 0d548a277c8ce29712161995985bb67cd1c35ff7
diff --git a/trunk/drivers/video/omap2/Makefile b/trunk/drivers/video/omap2/Makefile
index d853d05dad31..5ddef129f798 100644
--- a/trunk/drivers/video/omap2/Makefile
+++ b/trunk/drivers/video/omap2/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_OMAP2_VRAM) += vram.o
 obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
 
-obj-y += dss/
-obj-y += omapfb/
+obj-$(CONFIG_OMAP2_DSS) += dss/
+obj-$(CONFIG_FB_OMAP2) += omapfb/
 obj-y += displays/