diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-um/ipc.h | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-um/ipc.h')
| -rw-r--r-- | include/asm-um/ipc.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-um/ipc.h b/include/asm-um/ipc.h index e2ddc47f3e52..a46e3d9c2a3f 100644 --- a/include/asm-um/ipc.h +++ b/include/asm-um/ipc.h | |||
| @@ -1,6 +1 @@ | |||
| 1 | #ifndef __UM_IPC_H | #include <asm-generic/ipc.h> | |
| 2 | #define __UM_IPC_H | ||
| 3 | |||
| 4 | #include "asm/arch/ipc.h" | ||
| 5 | |||
| 6 | #endif | ||