diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-01-12 17:07:46 -0500 |
| commit | 0a87a2db485a1456b7427914969c0e8195a1bbda (patch) | |
| tree | 8d0186672af22c6ee76118c471881cd66a36502d /include/uapi/linux/can/error.h | |
| parent | 7226572d8ed48f7e1aa9de5383d919490d6e9a0c (diff) | |
| parent | fcf3aac5fc307f0cae429f5844ddc25761662858 (diff) | |
Merge tag 'topic/i915-hda-componentized-2015-01-12' into drm-intel-next-queued
Conflicts:
drivers/gpu/drm/i915/intel_runtime_pm.c
Separate branch so that Takashi can also pull just this refactoring
into sound-next.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/uapi/linux/can/error.h')
| -rw-r--r-- | include/uapi/linux/can/error.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/can/error.h b/include/uapi/linux/can/error.h index c247446ab25a..1c508be9687f 100644 --- a/include/uapi/linux/can/error.h +++ b/include/uapi/linux/can/error.h | |||
| @@ -71,6 +71,7 @@ | |||
| 71 | #define CAN_ERR_CRTL_TX_PASSIVE 0x20 /* reached error passive status TX */ | 71 | #define CAN_ERR_CRTL_TX_PASSIVE 0x20 /* reached error passive status TX */ |
| 72 | /* (at least one error counter exceeds */ | 72 | /* (at least one error counter exceeds */ |
| 73 | /* the protocol-defined level of 127) */ | 73 | /* the protocol-defined level of 127) */ |
| 74 | #define CAN_ERR_CRTL_ACTIVE 0x40 /* recovered to error active state */ | ||
| 74 | 75 | ||
| 75 | /* error in CAN protocol (type) / data[2] */ | 76 | /* error in CAN protocol (type) / data[2] */ |
| 76 | #define CAN_ERR_PROT_UNSPEC 0x00 /* unspecified */ | 77 | #define CAN_ERR_PROT_UNSPEC 0x00 /* unspecified */ |