diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /include/linux/if_frad.h | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 |