Merge commit 'origin/master'

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/kernel/stacktrace.c
	arch/powerpc/mm/slice.c
	arch/ppc/kernel/smp.c

1 files changed, 1 insertions, 3 deletions

diff --git a/arch/mips/jazz/setup.c b/arch/mips/jazz/setup.c
index a7947199c99b..f60524e8bc44 100644
--- a/arch/mips/jazz/setup.c
+++ b/arch/mips/jazz/setup.c
@@ -76,10 +76,8 @@ void __init plat_mem_setup(void)
 
         set_io_port_base(JAZZ_PORT_BASE);
 #ifdef CONFIG_EISA
-        if (mips_machtype == MACH_MIPS_MAGNUM_4000)
-                EISA_bus = 1;
+        EISA_bus = 1;
 #endif
-        isa_slot_offset = 0xe3000000;
 
         /* request I/O space for devices used on all i[345]86 PCs */
         for (i = 0; i < ARRAY_SIZE(jazz_io_resources); i++)