diff --git a/[refs] b/[refs]
index 6b8b8553eec3..f90d155a7598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39bd5e59b1ebdaa58d9458923ab96f61bda1296c
+refs/heads/master: 085494ac2039433a5df9fdd6fb653579e18b8c71
diff --git a/trunk/drivers/staging/comedi/comedi_internal.h b/trunk/drivers/staging/comedi/comedi_internal.h
index 81b6f7811625..b36bb954db58 100644
--- a/trunk/drivers/staging/comedi/comedi_internal.h
+++ b/trunk/drivers/staging/comedi/comedi_internal.h
@@ -31,4 +31,19 @@ int insn_inval(struct comedi_device *, struct comedi_subdevice *,
 void comedi_device_detach(struct comedi_device *);
 int comedi_device_attach(struct comedi_device *, struct comedi_devconfig *);
 
+#ifdef CONFIG_PROC_FS
+
+/* proc.c */
+
+void comedi_proc_init(void);
+void comedi_proc_cleanup(void);
+#else
+static inline void comedi_proc_init(void)
+{
+}
+static inline void comedi_proc_cleanup(void)
+{
+}
+#endif
+
 #endif /* _COMEDI_INTERNAL_H */
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index afaf2ae4a9ec..f4541aec419e 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -263,19 +263,6 @@ void cleanup_polling(void);
 void start_polling(struct comedi_device *);
 void stop_polling(struct comedi_device *);
 
-#ifdef CONFIG_PROC_FS
-void comedi_proc_init(void);
-void comedi_proc_cleanup(void);
-#else
-static inline void comedi_proc_init(void)
-{
-}
-
-static inline void comedi_proc_cleanup(void)
-{
-}
-#endif
-
 /* subdevice runflags */
 enum subdevice_runflags {
 	SRF_USER = 0x00000001,