diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-26 17:32:00 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-26 17:32:00 +0300 |
| commit | 36e9f7203e05090031a5356be043a9be342e383c (patch) | |
| tree | 27877737c3bb3c00ee9caeece7d671f65cf91252 /include/uapi/linux/libc-compat.h | |
| parent | 721dfe4133a9a41e4b4a74e5b41089b7dac8f539 (diff) | |
| parent | 4a3928c6f8a53fa1aed28ccba227742486e8ddcb (diff) | |
| download | linux-36e9f7203e05090031a5356be043a9be342e383c.tar.xz | |
Merge 4.16-rc3 into staging-next
We want the IIO/Staging fixes in here, and to resolve a merge problem
with the move of the fsl-mc code.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/uapi/linux/libc-compat.h')
| -rw-r--r-- | include/uapi/linux/libc-compat.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h index fc29efaa918c..8254c937c9f4 100644 --- a/include/uapi/linux/libc-compat.h +++ b/include/uapi/linux/libc-compat.h @@ -264,10 +264,4 @@ #endif /* __GLIBC__ */ -/* Definitions for if_ether.h */ -/* allow libcs like musl to deactivate this, glibc does not implement this. */ -#ifndef __UAPI_DEF_ETHHDR -#define __UAPI_DEF_ETHHDR 1 -#endif - #endif /* _UAPI_LIBC_COMPAT_H */ |