diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/linux/if_frad.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/linux/if_frad.h')
| -rw-r--r-- | include/linux/if_frad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 80b3a1056a5f..191ee0869bc1 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h | |||
| @@ -135,7 +135,7 @@ struct frhdr | |||
| 135 | __be16 PID; | 135 | __be16 PID; |
| 136 | 136 | ||
| 137 | #define IP_NLPID pad | 137 | #define IP_NLPID pad |
| 138 | } __attribute__((packed)); | 138 | } __packed; |
| 139 | 139 | ||
| 140 | /* see RFC 1490 for the definition of the following */ | 140 | /* see RFC 1490 for the definition of the following */ |
| 141 | #define FRAD_I_UI 0x03 | 141 | #define FRAD_I_UI 0x03 |