[PATCH] mips: clean up 32/64-bit configuration

Start cleaning 32-bit vs. 64-bit configuration.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 5 deletions

diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index a0230ee0f7f4..d3303584fbd1 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -13,8 +13,8 @@ binfmt_irix-objs	:= irixelf.o irixinv.o irixioctl.o irixsig.o	\
 
 ifdef CONFIG_MODULES
 obj-y                           += mips_ksyms.o module.o
-obj-$(CONFIG_MIPS32)            += module-elf32.o
-obj-$(CONFIG_MIPS64)            += module-elf64.o
+obj-$(CONFIG_32BIT)             += module-elf32.o
+obj-$(CONFIG_64BIT)             += module-elf64.o
 endif
 
 obj-$(CONFIG_CPU_R3000)         += r2300_fpu.o r2300_switch.o
@@ -45,8 +45,8 @@ obj-$(CONFIG_IRQ_CPU_RM7K)	+= irq-rm7000.o
 obj-$(CONFIG_IRQ_CPU_RM9K)      += irq-rm9000.o
 obj-$(CONFIG_IRQ_MV64340)       += irq-mv6434x.o
 
-obj-$(CONFIG_MIPS32)            += scall32-o32.o
-obj-$(CONFIG_MIPS64)            += scall64-64.o
+obj-$(CONFIG_32BIT)             += scall32-o32.o
+obj-$(CONFIG_64BIT)             += scall64-64.o
 obj-$(CONFIG_BINFMT_IRIX)       += binfmt_irix.o
 obj-$(CONFIG_MIPS32_COMPAT)     += ioctl32.o linux32.o signal32.o
 obj-$(CONFIG_MIPS32_N32)        += binfmt_elfn32.o scall64-n32.o signal_n32.o
@@ -55,7 +55,7 @@ obj-$(CONFIG_MIPS32_O32)	+= binfmt_elfo32.o scall64-o32.o ptrace32.o
 obj-$(CONFIG_KGDB)              += gdb-low.o gdb-stub.o
 obj-$(CONFIG_PROC_FS)           += proc.o
 
-obj-$(CONFIG_MIPS64)            += cpu-bugs64.o
+obj-$(CONFIG_64BIT)             += cpu-bugs64.o
 
 obj-$(CONFIG_GEN_RTC)           += genrtc.o