diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:09:59 -0500 |
| commit | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch) | |
| tree | da3aa535c98cc0957851354ceb0fbff7482d7a9d /include/asm-m32r/ipcbuf.h | |
| parent | 1a1689344add3333d28d1b5495d8043a3877d01c (diff) | |
| parent | 4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff) | |
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'include/asm-m32r/ipcbuf.h')
| -rw-r--r-- | include/asm-m32r/ipcbuf.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-m32r/ipcbuf.h b/include/asm-m32r/ipcbuf.h index 7c77fb0b1467..8d2d7c8ffdb0 100644 --- a/include/asm-m32r/ipcbuf.h +++ b/include/asm-m32r/ipcbuf.h | |||
| @@ -1,10 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_IPCBUF_H | 1 | #ifndef _ASM_M32R_IPCBUF_H |
| 2 | #define _ASM_M32R_IPCBUF_H | 2 | #define _ASM_M32R_IPCBUF_H |
| 3 | 3 | ||
| 4 | /* $Id$ */ | ||
| 5 | |||
| 6 | /* orig : i386 2.4.18 */ | ||
| 7 | |||
| 8 | /* | 4 | /* |
| 9 | * The ipc64_perm structure for m32r architecture. | 5 | * The ipc64_perm structure for m32r architecture. |
| 10 | * Note extra padding because this structure is passed back and forth | 6 | * Note extra padding because this structure is passed back and forth |