diff --git a/[refs] b/[refs]
index 8336451e9777..919fbf1ec96f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2132deff694765bc2e6c7ac84c6b30dab0775256
+refs/heads/master: b704e82a54591d69816b45f4324caf143f1a6fc8
diff --git a/trunk/drivers/media/video/Makefile b/trunk/drivers/media/video/Makefile
index b88b6174a331..c51c386559f2 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -160,8 +160,6 @@ obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
 
-obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
-
 obj-$(CONFIG_VIDEO_AU0828) += au0828/
 
 obj-$(CONFIG_USB_VIDEO_CLASS)	+= uvc/