diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /include/asm-x86/socket.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'include/asm-x86/socket.h')
| -rw-r--r-- | include/asm-x86/socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/socket.h b/include/asm-x86/socket.h index 80af9c4ccad7..db73274c83c3 100644 --- a/include/asm-x86/socket.h +++ b/include/asm-x86/socket.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_SOCKET_H | 1 | #ifndef ASM_X86__SOCKET_H |
| 2 | #define _ASM_SOCKET_H | 2 | #define ASM_X86__SOCKET_H |
| 3 | 3 | ||
| 4 | #include <asm/sockios.h> | 4 | #include <asm/sockios.h> |
| 5 | 5 | ||
| @@ -54,4 +54,4 @@ | |||
| 54 | 54 | ||
| 55 | #define SO_MARK 36 | 55 | #define SO_MARK 36 |
| 56 | 56 | ||
| 57 | #endif /* _ASM_SOCKET_H */ | 57 | #endif /* ASM_X86__SOCKET_H */ |