diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/linux/if_strip.h | |
parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/linux/if_strip.h')
-rw-r--r-- | include/linux/if_strip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/if_strip.h b/include/linux/if_strip.h index fb5c5c98442f..6526a6235832 100644 --- a/include/linux/if_strip.h +++ b/include/linux/if_strip.h | |||
@@ -18,6 +18,8 @@ | |||
18 | #ifndef __LINUX_STRIP_H | 18 | #ifndef __LINUX_STRIP_H |
19 | #define __LINUX_STRIP_H | 19 | #define __LINUX_STRIP_H |
20 | 20 | ||
21 | #include <linux/types.h> | ||
22 | |||
21 | typedef struct { | 23 | typedef struct { |
22 | __u8 c[6]; | 24 | __u8 c[6]; |
23 | } MetricomAddress; | 25 | } MetricomAddress; |