diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:23:36 -0400 |
| commit | 766d02786ecd22932beeb9ca8bad6d8c5a552ef9 (patch) | |
| tree | f6f2df0e35bbea914d1f4d12be6d02f128c73575 /include/asm-sparc/ioctl.h | |
| parent | 906d882cacecd37ad2fdd03ed2a9b232bcb9507e (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'include/asm-sparc/ioctl.h')
| -rw-r--r-- | include/asm-sparc/ioctl.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-sparc/ioctl.h b/include/asm-sparc/ioctl.h index e6fc4de19940..7d6bd51321b9 100644 --- a/include/asm-sparc/ioctl.h +++ b/include/asm-sparc/ioctl.h | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | /* $Id: ioctl.h,v 1.6 1999/12/01 23:58:36 davem Exp $ */ | ||
| 2 | #ifndef _SPARC_IOCTL_H | 1 | #ifndef _SPARC_IOCTL_H |
| 3 | #define _SPARC_IOCTL_H | 2 | #define _SPARC_IOCTL_H |
| 4 | 3 | ||