commit 003a46cfff308ee0d879dfa89b9a7c65b2a481bf
author Thomas Gleixner <tglx@linutronix.de> Mon Oct 15 13:57:47 2007 +0200
committer Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> Wed Oct 17 20:17:10 2007 +0200
tree 234552110912d4b9d6519474823e98e1a1726d16
parent 217d115cd5d7d2bef7db7839b93ce5dc2867c392

x86: unify some more trivial include/asm-x86/ 32/64 variants

Scripted unification.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

include/asm-x86/shmparam.h

diff --git a/include/asm-x86/shmparam.h b/include/asm-x86/shmparam.h
index 165627c..0880cf0 100644
--- a/include/asm-x86/shmparam.h
+++ b/include/asm-x86/shmparam.h
@@ -1,13 +1,6 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "shmparam_32.h"
-# else
-#  include "shmparam_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "shmparam_32.h"
-# else
-#  include "shmparam_64.h"
-# endif
-#endif
+#ifndef _ASM_X86_SHMPARAM_H
+#define _ASM_X86_SHMPARAM_H
+
+#define SHMLBA PAGE_SIZE	 /* attach addr a multiple of this */
+
+#endif /* _ASM_X86_SHMPARAM_H */