diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /include/asm-sparc64/ioctl.h | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'include/asm-sparc64/ioctl.h')
| -rw-r--r-- | include/asm-sparc64/ioctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc64/ioctl.h b/include/asm-sparc64/ioctl.h index 253d0b57b316..d634c21b4724 100644 --- a/include/asm-sparc64/ioctl.h +++ b/include/asm-sparc64/ioctl.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: ioctl.h,v 1.2 1998/10/15 05:40:38 jj Exp $ */ | ||
| 2 | #ifndef _SPARC64_IOCTL_H | 1 | #ifndef _SPARC64_IOCTL_H |
| 3 | #define _SPARC64_IOCTL_H | 2 | #define _SPARC64_IOCTL_H |
| 4 | 3 | ||