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/phonet.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/phonet.h')
| -rw-r--r-- | include/linux/phonet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h index e5126cff9b2a..76edadf046d3 100644 --- a/include/linux/phonet.h +++ b/include/linux/phonet.h | |||
| @@ -98,7 +98,7 @@ struct sockaddr_pn { | |||
| 98 | __u8 spn_dev; | 98 | __u8 spn_dev; |
| 99 | __u8 spn_resource; | 99 | __u8 spn_resource; |
| 100 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; | 100 | __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; |
| 101 | } __attribute__ ((packed)); | 101 | } __attribute__((packed)); |
| 102 | 102 | ||
| 103 | /* Well known address */ | 103 | /* Well known address */ |
| 104 | #define PN_DEV_PC 0x10 | 104 | #define PN_DEV_PC 0x10 |