diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
| commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
| tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /include/asm-powerpc/socket.h | |
| parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
| parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'include/asm-powerpc/socket.h')
| -rw-r--r-- | include/asm-powerpc/socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/socket.h b/include/asm-powerpc/socket.h index 51a0cf5ee9f0..e4b8177d4acc 100644 --- a/include/asm-powerpc/socket.h +++ b/include/asm-powerpc/socket.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _POWERPC_SOCKET_H | 1 | #ifndef _ASM_POWERPC_SOCKET_H |
| 2 | #define _POWERPC_SOCKET_H | 2 | #define _ASM_POWERPC_SOCKET_H |
| 3 | 3 | ||
| 4 | /* | 4 | /* |
| 5 | * This program is free software; you can redistribute it and/or | 5 | * This program is free software; you can redistribute it and/or |
| @@ -56,4 +56,4 @@ | |||
| 56 | 56 | ||
| 57 | #define SO_PEERSEC 31 | 57 | #define SO_PEERSEC 31 |
| 58 | 58 | ||
| 59 | #endif /* _POWERPC_SOCKET_H */ | 59 | #endif /* _ASM_POWERPC_SOCKET_H */ |