commit ba8d4f460b51161eb82cf1006cb34a3cc1389f47
author Christopher Ferris <cferris@google.com> Wed Sep 03 19:56:49 2014 -0700
committer Christopher Ferris <cferris@google.com> Wed Sep 17 17:05:17 2014 -0700
tree f15ca2fce81d0151d51a6cbbe8bad11513c98c46
parent 6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd

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

libc/kernel/uapi/linux/can.h

diff --git a/libc/kernel/uapi/linux/can.h b/libc/kernel/uapi/linux/can.h
index 9549bbf..df7715b 100644
--- a/libc/kernel/uapi/linux/can.h
+++ b/libc/kernel/uapi/linux/can.h
@@ -16,8 +16,8 @@
  ***
  ****************************************************************************
  ****************************************************************************/
-#ifndef CAN_H
-#define CAN_H
+#ifndef _UAPI_CAN_H
+#define _UAPI_CAN_H
 #include <linux/types.h>
 #include <linux/socket.h>
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */