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/error.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/error.h')
| -rw-r--r-- | include/uapi/linux/can/error.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/can/error.h b/include/uapi/linux/can/error.h index b63204545320..c247446ab25a 100644 --- a/include/uapi/linux/can/error.h +++ b/include/uapi/linux/can/error.h | |||
| @@ -41,8 +41,8 @@ | |||
| 41 | * DAMAGE. | 41 | * DAMAGE. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #ifndef CAN_ERROR_H | 44 | #ifndef _UAPI_CAN_ERROR_H |
| 45 | #define CAN_ERROR_H | 45 | #define _UAPI_CAN_ERROR_H |
| 46 | 46 | ||
| 47 | #define CAN_ERR_DLC 8 /* dlc for error message frames */ | 47 | #define CAN_ERR_DLC 8 /* dlc for error message frames */ |
| 48 | 48 | ||
| @@ -120,4 +120,4 @@ | |||
| 120 | 120 | ||
| 121 | /* controller specific additional information / data[5..7] */ | 121 | /* controller specific additional information / data[5..7] */ |
| 122 | 122 | ||
| 123 | #endif /* CAN_ERROR_H */ | 123 | #endif /* _UAPI_CAN_ERROR_H */ |