diff --git a/[refs] b/[refs]
index 026c0835ec8d..9b28fcc22b54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf8e27f7a7da413c1cf3dad4afdcf1b17418285
+refs/heads/master: a8275fcaa7ca1f720f0c1b1c4c373964ffc9f72d
diff --git a/trunk/drivers/staging/comedi/proc.c b/trunk/drivers/staging/comedi/proc.c
index 7db12ac0d280..5a2b72d87572 100644
--- a/trunk/drivers/staging/comedi/proc.c
+++ b/trunk/drivers/staging/comedi/proc.c
@@ -85,6 +85,7 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
 	return l;
 }
 
+#ifdef CONFIG_PROC_FS
 void comedi_proc_init(void)
 {
 	struct proc_dir_entry *comedi_proc;
@@ -98,3 +99,4 @@ void comedi_proc_cleanup(void)
 {
 	remove_proc_entry("comedi", 0);
 }
+#endif