diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:21:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 20:21:32 -0400 |
| commit | 789319db76ccb8f61d2f6a91d2f2fcb70edae9c5 (patch) | |
| tree | 9f00eee8fbeec58c0a5ee6c9ebb8906e8a832670 /include/asm-sparc64/socket.h | |
| parent | fd9908c078b30db393e9855fb96f804793af23ba (diff) | |
| parent | 93dae5b70e7c1c8e927d22e1c20a941ca376906a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Add global register dumping facility.
sparc: remove CVS keywords
sparc64: remove CVS keywords
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 | ||