diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /include/asm-powerpc/ioctl.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-powerpc/ioctl.h')
| -rw-r--r-- | include/asm-powerpc/ioctl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-powerpc/ioctl.h b/include/asm-powerpc/ioctl.h index 93c6acfdd0fd..8eb99848c402 100644 --- a/include/asm-powerpc/ioctl.h +++ b/include/asm-powerpc/ioctl.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _PPC_IOCTL_H | 1 | #ifndef _ASM_POWERPC_IOCTL_H |
| 2 | #define _PPC_IOCTL_H | 2 | #define _ASM_POWERPC_IOCTL_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | /* | 5 | /* |
| @@ -66,4 +66,4 @@ extern unsigned int __invalid_size_argument_for_IOC; | |||
| 66 | #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) | 66 | #define IOCSIZE_MASK (_IOC_SIZEMASK << _IOC_SIZESHIFT) |
| 67 | #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) | 67 | #define IOCSIZE_SHIFT (_IOC_SIZESHIFT) |
| 68 | 68 | ||
| 69 | #endif | 69 | #endif /* _ASM_POWERPC_IOCTL_H */ |