summaryrefslogtreecommitdiffstats
path: root/libc/kernel/uapi/linux/can/error.h
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-09-03 19:56:49 -0700
committerChristopher Ferris <cferris@google.com>2014-09-17 17:05:17 -0700
commitba8d4f460b51161eb82cf1006cb34a3cc1389f47 (patch)
treef15ca2fce81d0151d51a6cbbe8bad11513c98c46 /libc/kernel/uapi/linux/can/error.h
parent6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd (diff)
downloadbionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.zip
bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.gz
bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.bz2
Update kernel uapi headers to v3.16.1.
Other changes to support the new headers: - Remove the flock64 structure it is defined in the new headers. - Update the syscalls to correspond with the headers. Change-Id: I49a6b07e8b2bfffb67be71b07b58e4e6848fcc09
Diffstat (limited to 'libc/kernel/uapi/linux/can/error.h')
-rw-r--r--libc/kernel/uapi/linux/can/error.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/kernel/uapi/linux/can/error.h b/libc/kernel/uapi/linux/can/error.h
index 2436ace..46af758 100644
--- a/libc/kernel/uapi/linux/can/error.h
+++ b/libc/kernel/uapi/linux/can/error.h
@@ -16,8 +16,8 @@
***
****************************************************************************
****************************************************************************/
-#ifndef CAN_ERROR_H
-#define CAN_ERROR_H
+#ifndef _UAPI_CAN_ERROR_H
+#define _UAPI_CAN_ERROR_H
#define CAN_ERR_DLC 8
#define CAN_ERR_TX_TIMEOUT 0x00000001U
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */