diff --git a/[refs] b/[refs]
index 74e83ab45168..7c39c9421206 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2e0b62e050374ddbf3221e7b78e1d0f26e148cb
+refs/heads/master: 2ea55ad3897d8abac07435190c851f804433801f
diff --git a/trunk/drivers/media/video/em28xx/Makefile b/trunk/drivers/media/video/em28xx/Makefile
index 573d2b878445..a5ea678b8c29 100644
--- a/trunk/drivers/media/video/em28xx/Makefile
+++ b/trunk/drivers/media/video/em28xx/Makefile
@@ -1,7 +1,7 @@
 em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
 		   em28xx-input.o
 
-obj-$(CONFIG_EM28XX) += em28xx.o
-obj-$(CONFIG_EM28XX) += saa711x.o tvp5150.o
+obj-$(CONFIG_VIDEO_EM28XX) += em28xx.o
+obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o
 
 EXTRA_CFLAGS += -I$(src)/..