diff --git a/[refs] b/[refs]
index 4527a2221af4..9c9a85cde145 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1087020fb0b12cdebb8c577ec2d1b26e724a1a7c
+refs/heads/master: 23d18860db3c166d0ff855c3fb347495c79ae510
diff --git a/trunk/drivers/staging/comedi/Makefile b/trunk/drivers/staging/comedi/Makefile
index 20afea301c87..8dbd306fef88 100644
--- a/trunk/drivers/staging/comedi/Makefile
+++ b/trunk/drivers/staging/comedi/Makefile
@@ -3,7 +3,7 @@ obj-$(CONFIG_COMEDI) += comedi.o
 obj-$(CONFIG_COMEDI)	+= kcomedilib/
 obj-$(CONFIG_COMEDI)	+= drivers/
 
-comedi-objs :=		\
+comedi-y :=		\
 	comedi_fops.o	\
 	proc.o		\
 	range.o		\