diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-03 02:55:27 -0500 |
commit | fb53fde9762432d091dac209bdf4f3f850117c55 (patch) | |
tree | 607b09022b206a539cb4a924e4ef476443798252 /include/linux/can | |
parent | eb4400e3a040b90a3ad805b01fcbc99a5f615c8f (diff) | |
parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/can')
-rw-r--r-- | include/linux/can/bcm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/can/bcm.h b/include/linux/can/bcm.h index 7f293273c444..1432b278c52d 100644 --- a/include/linux/can/bcm.h +++ b/include/linux/can/bcm.h | |||
@@ -14,6 +14,8 @@ | |||
14 | #ifndef CAN_BCM_H | 14 | #ifndef CAN_BCM_H |
15 | #define CAN_BCM_H | 15 | #define CAN_BCM_H |
16 | 16 | ||
17 | #include <linux/types.h> | ||
18 | |||
17 | /** | 19 | /** |
18 | * struct bcm_msg_head - head of messages to/from the broadcast manager | 20 | * struct bcm_msg_head - head of messages to/from the broadcast manager |
19 | * @opcode: opcode, see enum below. | 21 | * @opcode: opcode, see enum below. |