diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /include/uapi/linux/can/error.h | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
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 */ |