Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision a0edf5f83740c6ba4b11f166e36e317d198be0e2)
+++ kernel/generic/include/ipc/ipc.h	(revision b878df35b26c3ffd9e0cba6d2ed11dbf7ba0d58b)
@@ -178,5 +178,5 @@
 #define IPC_M_PING		512
 /* User methods */
-#define FIRST_USER_METHOD	1024
+#define IPC_FIRST_USER_METHOD	1024
 
 #ifdef KERNEL