summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-16 09:39:03 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-17 07:43:58 +0200
commit0d57d70dfbb753c0f017daff42a5e285c249f5b8 (patch)
tree6538b5a8dfb17e8b32758a77386ebf742844b3b4
parent54889bff1e981c555c377ac5aa4e263b388bef91 (diff)
downloadbarebox-0d57d70dfbb753c0f017daff42a5e285c249f5b8.tar.gz
barebox-0d57d70dfbb753c0f017daff42a5e285c249f5b8.tar.xz
X86: Move BITS_PER_LONG definition to types.h
Because that's where it belongs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/x86/include/asm/bitops.h2
-rw-r--r--arch/x86/include/asm/types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index d741e44d4a..e525812c97 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -23,8 +23,6 @@
#ifndef _ASM_X86_BITOPS_H_
#define _ASM_X86_BITOPS_H_
-#define BITS_PER_LONG 32
-
#include <asm-generic/bitops/__fls.h>
#include <asm-generic/bitops/__ffs.h>
#include <asm-generic/bitops/fls.h>
diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h
index d473405ff9..b3fd1f644b 100644
--- a/arch/x86/include/asm/types.h
+++ b/arch/x86/include/asm/types.h
@@ -41,6 +41,8 @@ typedef unsigned int u32;
typedef signed long long s64;
typedef unsigned long long u64;
+#define BITS_PER_LONG 32
+
#endif /* __ASSEMBLY__ */
#endif /* __ASM_X86_TYPES_H */