diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/sysv_fs.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/sysv_fs.h')
| -rw-r--r-- | include/linux/sysv_fs.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/sysv_fs.h b/include/linux/sysv_fs.h index e0248631e461..96411306eec6 100644 --- a/include/linux/sysv_fs.h +++ b/include/linux/sysv_fs.h | |||
| @@ -1,11 +1,7 @@ | |||
| 1 | #ifndef _LINUX_SYSV_FS_H | 1 | #ifndef _LINUX_SYSV_FS_H |
| 2 | #define _LINUX_SYSV_FS_H | 2 | #define _LINUX_SYSV_FS_H |
| 3 | 3 | ||
| 4 | #if defined(__GNUC__) | 4 | #define __packed2__ __attribute__((packed, aligned(2))) |
| 5 | # define __packed2__ __attribute__((packed, aligned(2))) | ||
| 6 | #else | ||
| 7 | >> I want to scream! << | ||
| 8 | #endif | ||
| 9 | 5 | ||
| 10 | 6 | ||
| 11 | #ifndef __KERNEL__ | 7 | #ifndef __KERNEL__ |