am 9d43c079: am 4e882503: am a990cf5b: Merge "Clean up trailing whitespace in the kernel headers."

# Via Android Git Automerger (2) and others
* commit '9d43c079875ebd2540daccb180e9d6d0fa06061d':
  Clean up trailing whitespace in the kernel headers.

1 files changed, 30 insertions, 30 deletions

diff --git a/libc/kernel/common/linux/icmp.h b/libc/kernel/common/linux/icmp.h
index 3a2580e..d166e97 100644
--- a/libc/kernel/common/linux/icmp.h
+++ b/libc/kernel/common/linux/icmp.h
@@ -19,31 +19,31 @@
 #ifndef _LINUX_ICMP_H
 #define _LINUX_ICMP_H
 #include <linux/types.h>
-#define ICMP_ECHOREPLY 0  
+#define ICMP_ECHOREPLY 0
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_DEST_UNREACH 3  
-#define ICMP_SOURCE_QUENCH 4  
-#define ICMP_REDIRECT 5  
-#define ICMP_ECHO 8  
+#define ICMP_DEST_UNREACH 3
+#define ICMP_SOURCE_QUENCH 4
+#define ICMP_REDIRECT 5
+#define ICMP_ECHO 8
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_TIME_EXCEEDED 11  
-#define ICMP_PARAMETERPROB 12  
-#define ICMP_TIMESTAMP 13  
-#define ICMP_TIMESTAMPREPLY 14  
+#define ICMP_TIME_EXCEEDED 11
+#define ICMP_PARAMETERPROB 12
+#define ICMP_TIMESTAMP 13
+#define ICMP_TIMESTAMPREPLY 14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_INFO_REQUEST 15  
-#define ICMP_INFO_REPLY 16  
-#define ICMP_ADDRESS 17  
-#define ICMP_ADDRESSREPLY 18  
+#define ICMP_INFO_REQUEST 15
+#define ICMP_INFO_REPLY 16
+#define ICMP_ADDRESS 17
+#define ICMP_ADDRESSREPLY 18
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define NR_ICMP_TYPES 18
-#define ICMP_NET_UNREACH 0  
-#define ICMP_HOST_UNREACH 1  
-#define ICMP_PROT_UNREACH 2  
+#define ICMP_NET_UNREACH 0
+#define ICMP_HOST_UNREACH 1
+#define ICMP_PROT_UNREACH 2
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_PORT_UNREACH 3  
-#define ICMP_FRAG_NEEDED 4  
-#define ICMP_SR_FAILED 5  
+#define ICMP_PORT_UNREACH 3
+#define ICMP_FRAG_NEEDED 4
+#define ICMP_SR_FAILED 5
 #define ICMP_NET_UNKNOWN 6
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define ICMP_HOST_UNKNOWN 7
@@ -53,18 +53,18 @@
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 #define ICMP_NET_UNR_TOS 11
 #define ICMP_HOST_UNR_TOS 12
-#define ICMP_PKT_FILTERED 13  
-#define ICMP_PREC_VIOLATION 14  
+#define ICMP_PKT_FILTERED 13
+#define ICMP_PREC_VIOLATION 14
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_PREC_CUTOFF 15  
-#define NR_ICMP_UNREACH 15  
-#define ICMP_REDIR_NET 0  
-#define ICMP_REDIR_HOST 1  
+#define ICMP_PREC_CUTOFF 15
+#define NR_ICMP_UNREACH 15
+#define ICMP_REDIR_NET 0
+#define ICMP_REDIR_HOST 1
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
-#define ICMP_REDIR_NETTOS 2  
-#define ICMP_REDIR_HOSTTOS 3  
-#define ICMP_EXC_TTL 0  
-#define ICMP_EXC_FRAGTIME 1  
+#define ICMP_REDIR_NETTOS 2
+#define ICMP_REDIR_HOSTTOS 3
+#define ICMP_EXC_TTL 0
+#define ICMP_EXC_FRAGTIME 1
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
 struct icmphdr {
  __u8 type;
@@ -79,7 +79,7 @@ struct icmphdr {
  } echo;
  __u32 gateway;
  struct {
- __u16 __unused_field;
+ __u16 __linux_unused;
 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
  __u16 mtu;
  } frag;