Merge linux-2.6 with linux-acpi-2.6

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/mips/dec/ecc-berr.c b/arch/mips/dec/ecc-berr.c
index 133fb7c48e6c..6dbce92eb068 100644
--- a/arch/mips/dec/ecc-berr.c
+++ b/arch/mips/dec/ecc-berr.c
@@ -253,7 +253,7 @@ static inline void dec_kn03_be_init(void)
 
         kn0x_erraddr = (void *)(KN03_SLOT_BASE + IOASIC_ERRADDR);
         kn0x_chksyn = (void *)(KN03_SLOT_BASE + IOASIC_CHKSYN);
-                        
+
         /*
          * Set normal ECC detection and generation, enable ECC correction.
          * For KN05 we also need to make sure EE (?) is enabled in the MB.
diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
index 3b3790993219..c89768d5c4e5 100644
--- a/arch/mips/dec/int-handler.S
+++ b/arch/mips/dec/int-handler.S
@@ -133,7 +133,7 @@
                  */
                 mfc0    t0,CP0_CAUSE            # get pending interrupts
                 mfc0    t1,CP0_STATUS
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
                 lw      t2,cpu_fpu_mask
 #endif
                 andi    t0,ST0_IM               # CAUSE.CE may be non-zero!
@@ -141,7 +141,7 @@
 
                 beqz    t0,spurious
 
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
                  and    t2,t0
                 bnez    t2,fpu                  # handle FPU immediately
 #endif
@@ -271,7 +271,7 @@ handle_it:
                 j       ret_from_irq
                  nop
 
-#ifdef CONFIG_MIPS32
+#ifdef CONFIG_32BIT
 fpu:
                 j       handle_fpe_int
                  nop
diff --git a/arch/mips/dec/prom/Makefile b/arch/mips/dec/prom/Makefile
index 373822ec2d8c..bcd0247b3a66 100644
--- a/arch/mips/dec/prom/Makefile
+++ b/arch/mips/dec/prom/Makefile
@@ -5,7 +5,7 @@
 
 lib-y                   += init.o memory.o cmdline.o identify.o console.o
 
-lib-$(CONFIG_MIPS32)    += locore.o
-lib-$(CONFIG_MIPS64)    += call_o32.o
+lib-$(CONFIG_32BIT)     += locore.o
+lib-$(CONFIG_64BIT)     += call_o32.o
 
 EXTRA_AFLAGS := $(CFLAGS)