Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-um / ipc.h

diff --git a/include/asm-um/ipc.h b/include/asm-um/ipc.h
index e2ddc47f3e52639bc7dffc235c7b67505589573e..a46e3d9c2a3fc176772d1b6b7726a977bb585cab 100644 (file)
--- a/include/asm-um/ipc.h
+++ b/include/asm-um/ipc.h
@@ -1,6 +1 @@
-#ifndef __UM_IPC_H
-#define __UM_IPC_H
-
-#include "asm/arch/ipc.h"
-
-#endif
+#include <asm-generic/ipc.h>