Merge bk://24.221.152.185/linux-2.5-misc

into cargo.(none):/home/paulus/kernel/for-linus-ppc

arch/ppc/platforms/prep_setup.c

@@ -57,6 +57,7 @@
 #include <asm/keyboard.h>
 #include <asm/vga.h>
 #include <asm/time.h>
+#include <asm/mpc10x.h>
 #include <asm/i8259.h>
 #include <asm/open_pic.h>
 
@@ -694,7 +695,7 @@ prep_init_IRQ(void)
 		openpic_init(1, NUM_8259_INTERRUPTS, -1);
 	for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
 		irq_desc[i].handler = &i8259_pic;
-	i8259_init(0xbffffff0); /* PCI interrupt ack address for MPC105 and 106 */
+	i8259_init(MPC10X_MAPA_PCI_INTACK_ADDR);
 }
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)

arch/ppc/xmon/start.c

@@ -95,6 +95,7 @@ static unsigned long chrp_find_phys_io_base(void)
 }
 #endif /* CONFIG_ALL_PPC */
 
+#ifdef CONFIG_MAGIC_SYSRQ
 static void sysrq_handle_xmon(int key, struct pt_regs *regs,
 			      struct kbd_struct *kbd, struct tty_struct *tty)
 {
@@ -107,6 +108,7 @@ static struct sysrq_key_op sysrq_xmon_op =
 	help_msg:	"Xmon",
 	action_msg:	"Entering xmon\n",
 };
+#endif
 
 void
 xmon_map_scc(void)
@@ -218,7 +220,9 @@ xmon_map_scc(void)
 	DLAB = 0x80;
 #endif /* platform */
 
+#ifdef CONFIG_MAGIC_SYSRQ
 	__sysrq_put_key_op('x', &sysrq_xmon_op);
+#endif
 }
 
 static int scc_initialized = 0;

include/asm-ppc/mpc10x.h

@@ -59,6 +59,7 @@
 #define MPC10X_MAPA_ISA_MEM_BASE	0xc0000000
 #define	MPC10X_MAPA_DRAM_OFFSET		0x80000000
 
+#define	MPC10X_MAPA_PCI_INTACK_ADDR	0xbffffff0
 #define	MPC10X_MAPA_PCI_IO_START	0x00000000
 #define	MPC10X_MAPA_PCI_IO_END	       (0x00800000 - 1)
 #define	MPC10X_MAPA_PCI_MEM_START	0x00000000
@@ -75,6 +76,7 @@
 #define MPC10X_MAPB_ISA_MEM_BASE	0x80000000
 #define	MPC10X_MAPB_DRAM_OFFSET		0x00000000
 
+#define	MPC10X_MAPB_PCI_INTACK_ADDR	0xfef00000
 #define	MPC10X_MAPB_PCI_IO_START	0x00000000
 #define	MPC10X_MAPB_PCI_IO_END	       (0x00c00000 - 1)
 #define	MPC10X_MAPB_PCI_MEM_START	0x80000000