diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-03 19:56:49 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-09-17 17:05:17 -0700 |
| commit | ba8d4f460b51161eb82cf1006cb34a3cc1389f47 (patch) | |
| tree | f15ca2fce81d0151d51a6cbbe8bad11513c98c46 /libc/kernel/uapi/linux/can.h | |
| parent | 6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd (diff) | |
| download | android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.gz android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.bz2 android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.zip | |
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.h')
| -rw-r--r-- | libc/kernel/uapi/linux/can.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/kernel/uapi/linux/can.h b/libc/kernel/uapi/linux/can.h index 9549bbf1d..df7715b7d 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 */ |