Merge "Clean up trailing whitespace in the kernel headers."
diff --git a/libc/include/sys/exec_elf.h b/libc/include/sys/exec_elf.h
index 1cc64a4..6d445bf 100644
--- a/libc/include/sys/exec_elf.h
+++ b/libc/include/sys/exec_elf.h
@@ -700,6 +700,8 @@
Elf64_Xword a_v; /* 64-bit id */
} Aux64Info;
+/* BEGIN android-changed: these constants should come from <linux/auxvec.h>. */
+#if 0
/* a_type */
#define AT_NULL 0 /* Marks end of array */
#define AT_IGNORE 1 /* No meaning, a_un is undefined */
@@ -740,6 +742,8 @@
#define AT_SUN_EMUL_EXECFD 2013 /* coff file descriptor */
/* Executable's fully resolved name */
#define AT_SUN_EXECNAME 2014
+#endif
+/* END android-changed */
/*
* Note Headers
