diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/linux/can/dev.h | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/linux/can/dev.h')
| -rw-r--r-- | include/linux/can/dev.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h index 3ce5e526525f..6992afc6ba7f 100644 --- a/include/linux/can/dev.h +++ b/include/linux/can/dev.h | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #ifndef CAN_DEV_H | 13 | #ifndef _CAN_DEV_H |
| 14 | #define CAN_DEV_H | 14 | #define _CAN_DEV_H |
| 15 | 15 | ||
| 16 | #include <linux/can.h> | 16 | #include <linux/can.h> |
| 17 | #include <linux/can/netlink.h> | 17 | #include <linux/can/netlink.h> |
| @@ -132,4 +132,4 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, | |||
| 132 | struct sk_buff *alloc_can_err_skb(struct net_device *dev, | 132 | struct sk_buff *alloc_can_err_skb(struct net_device *dev, |
| 133 | struct can_frame **cf); | 133 | struct can_frame **cf); |
| 134 | 134 | ||
| 135 | #endif /* CAN_DEV_H */ | 135 | #endif /* !_CAN_DEV_H */ |