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/uapi/linux/can/netlink.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/uapi/linux/can/netlink.h')
| -rw-r--r-- | include/uapi/linux/can/netlink.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 7e2e1863db16..813d11f54977 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | * GNU General Public License for more details. | 15 | * GNU General Public License for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef CAN_NETLINK_H | 18 | #ifndef _UAPI_CAN_NETLINK_H |
| 19 | #define CAN_NETLINK_H | 19 | #define _UAPI_CAN_NETLINK_H |
| 20 | 20 | ||
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | 22 | ||
| @@ -130,4 +130,4 @@ enum { | |||
| 130 | 130 | ||
| 131 | #define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1) | 131 | #define IFLA_CAN_MAX (__IFLA_CAN_MAX - 1) |
| 132 | 132 | ||
| 133 | #endif /* CAN_NETLINK_H */ | 133 | #endif /* !_UAPI_CAN_NETLINK_H */ |