Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / include / asm-mips / reg.h

diff --git a/include/asm-mips/reg.h b/include/asm-mips/reg.h
index 7b33bbca95857f8f7fdcbcb7670d3ebb74ac0dea..634b55d7e7f6d1ada10dfa02175c11a81790f78d 100644 (file)
--- a/include/asm-mips/reg.h
+++ b/include/asm-mips/reg.h
@@ -12,9 +12,8 @@
 #ifndef __ASM_MIPS_REG_H
 #define __ASM_MIPS_REG_H
 
-#include <linux/config.h>
 
-#if defined(CONFIG_MIPS32) || defined(WANT_COMPAT_REG_H)
+#if defined(CONFIG_32BIT) || defined(WANT_COMPAT_REG_H)
 
 #define EF_R0                  6
 #define EF_R1                  7
@@ -70,7 +69,7 @@
 
 #endif
 
-#if CONFIG_MIPS64
+#ifdef CONFIG_64BIT
 
 #define EF_R0                   0
 #define EF_R1                   1
@@ -124,6 +123,6 @@
 
 #define EF_SIZE                        304     /* size in bytes */
 
-#endif /* CONFIG_MIPS64 */
+#endif /* CONFIG_64BIT */
 
 #endif /* __ASM_MIPS_REG_H */