--- linux-2.6.11/include/linux/wait.h	2006-02-14 18:36:00.000000000 +0000
+++ linux-2.6.11/include/linux/wait.h	2006-02-14 18:55:07.000000000 +0000
@@ -356,6 +356,7 @@ 
 		INIT_LIST_HEAD(&(wait)->task_list);			\
 	} while (0)
 
+#ifndef __cplusplus
 /**
  * wait_on_bit - wait for a bit to be cleared
  * @word: the word being waited on, a kernel virtual address
@@ -401,5 +402,6 @@ 
 		return 0;
 	return out_of_line_wait_on_bit_lock(word, bit, action, mode);
 }
-	
+
+#endif	
 #endif