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/raw.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/raw.h')
| -rw-r--r-- | include/uapi/linux/can/raw.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/raw.h b/include/uapi/linux/can/raw.h index c7d8c334e0ce..78ec76fd89a6 100644 --- a/include/uapi/linux/can/raw.h +++ b/include/uapi/linux/can/raw.h | |||
| @@ -42,8 +42,8 @@ | |||
| 42 | * DAMAGE. | 42 | * DAMAGE. |
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #ifndef CAN_RAW_H | 45 | #ifndef _UAPI_CAN_RAW_H |
| 46 | #define CAN_RAW_H | 46 | #define _UAPI_CAN_RAW_H |
| 47 | 47 | ||
| 48 | #include <linux/can.h> | 48 | #include <linux/can.h> |
| 49 | 49 | ||
| @@ -59,4 +59,4 @@ enum { | |||
| 59 | CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ | 59 | CAN_RAW_FD_FRAMES, /* allow CAN FD frames (default:off) */ |
| 60 | }; | 60 | }; |
| 61 | 61 | ||
| 62 | #endif | 62 | #endif /* !_UAPI_CAN_RAW_H */ |