diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-12 05:27:22 -0400 |
| commit | bb6dfb32f90094fea647e1f27d994a8b6ddd2766 (patch) | |
| tree | e63681727543bcc3251bbc82b81a9cc822cc3f5e /include/asm-sparc64/socket.h | |
| parent | 4f384f8bcdb5d618a0a68fb84c809e602c798b8f (diff) | |
| parent | 5e70b7f3c24468bb1635b295945edb48ecd9656a (diff) | |
Merge branch 'linus' into x86/gart
Diffstat (limited to 'include/asm-sparc64/socket.h')
| -rw-r--r-- | include/asm-sparc64/socket.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h index 8cf071fae3eb..5af688f56716 100644 --- a/include/asm-sparc64/socket.h +++ b/include/asm-sparc64/socket.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: socket.h,v 1.10 2001/06/13 16:25:03 davem Exp $ */ | ||
| 2 | #ifndef _ASM_SOCKET_H | 1 | #ifndef _ASM_SOCKET_H |
| 3 | #define _ASM_SOCKET_H | 2 | #define _ASM_SOCKET_H |
| 4 | 3 | ||