diff --git a/[refs] b/[refs] index 9ed4cafcc596..d9697a2b8f9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9e0f5293d4999f93b469af4e70382db800a8204 +refs/heads/master: 9a8ea36967afad617d9b0930b6fe7592b9ed9772 diff --git a/trunk/include/linux/a.out.h b/trunk/include/linux/a.out.h index 208f4e8ed304..e86dfca44589 100644 --- a/trunk/include/linux/a.out.h +++ b/trunk/include/linux/a.out.h @@ -1,8 +1,6 @@ #ifndef __A_OUT_GNU_H__ #define __A_OUT_GNU_H__ -#ifdef CONFIG_ARCH_SUPPORTS_AOUT - #define __GNU_EXEC_MACROS__ #ifndef __STRUCT_EXEC_OVERRIDE__ @@ -277,10 +275,4 @@ struct relocation_info #endif /* no N_RELOCATION_INFO_DECLARED. */ #endif /*__ASSEMBLY__ */ -#else /* CONFIG_ARCH_SUPPORTS_AOUT */ -#ifndef __ASSEMBLY__ -struct exec { -}; -#endif -#endif /* CONFIG_ARCH_SUPPORTS_AOUT */ #endif /* __A_OUT_GNU_H__ */