Merge git://git.infradead.org/battery-2.6

[mirror_ubuntu-zesty-kernel.git] / include / linux / a.out.h

diff --git a/include/linux/a.out.h b/include/linux/a.out.h
index 82cd918f2ab708ca4545cf863e30f2db187777de..e86dfca44589f49e083e53a3f905868ba2e89955 100644 (file)
--- a/include/linux/a.out.h
+++ b/include/linux/a.out.h
@@ -9,6 +9,8 @@
 
 #endif /* __STRUCT_EXEC_OVERRIDE__ */
 
+#ifndef __ASSEMBLY__
+
 /* these go in the N_MACHTYPE field */
 enum machine_type {
 #if defined (M_OLDSUN2)
@@ -272,5 +274,5 @@ struct relocation_info
 };
 #endif /* no N_RELOCATION_INFO_DECLARED.  */
 
-
+#endif /*__ASSEMBLY__ */
 #endif /* __A_OUT_GNU_H__ */