am 3f6c18a1: am 7f728177: Merge "__unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form."

* commit '3f6c18a19de6b4c4756733535e51fa5425687c98':
  __unused would be modified to __linux_unused by the bionic scripts which clean the kernel headers. Move icmp.h to its original form.
diff --git a/original/linux/icmp.h b/original/linux/icmp.h
index b68dcfb..f0b571f 100644
--- a/original/linux/icmp.h
+++ b/original/linux/icmp.h
@@ -76,11 +76,7 @@
 	} echo;
 	__u32	gateway;
 	struct {
-#if 0	/* BIONIC: __unused is defined as "" */
 		__u16	__unused;
-#else
-        __u16   __unused_field;
-#endif
 		__u16	mtu;
 	} frag;
   } un;