diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 03:15:35 -0500 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/can | |
| parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
| parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
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. |