# This is a BitKeeper generated patch for the following project:
# Project Name: Linux 2.4
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.124   -> 1.125  
#	arch/ppc/8xx_io/fec.c	1.14    -> 1.15   
#	arch/ppc/8xx_io/uart.c	1.12    -> 1.13   
#	arch/ppc/kernel/setup.c	1.38    -> 1.39   
#	arch/ppc/kernel/Makefile	1.19    -> 1.20   
#	arch/ppc/kernel/checks.c	1.8     -> 1.9    
#	arch/ppc/xmon/Makefile	1.5     -> 1.6    
#	arch/ppc/kernel/m8xx_setup.c	1.19    -> 1.20   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 01/06/05	trini@bill-the-cat.bloom.county	1.125
# 01-cleanups.patch
# --------------------------------------------
#
diff -Nru a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
--- a/arch/ppc/8xx_io/fec.c	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/8xx_io/fec.c	Tue Jun  5 14:37:17 2001
@@ -1641,7 +1641,7 @@
 	immap->im_ioport.iop_pcdir &= ~0x0001;
 	immap->im_ioport.iop_pcso  &= ~0x0001;
 	immap->im_ioport.iop_pcint |=  0x0001;
-	cpm_install_handler(CPMVEC_PIO_PC15, mii_link_interrupt, dev);
+	cpm_install_handler(CPMVEC_PIO_PC15, (void *)mii_link_interrupt, dev);
 
 	/* Make LEDS reflect Link status.
 	*/
diff -Nru a/arch/ppc/8xx_io/uart.c b/arch/ppc/8xx_io/uart.c
--- a/arch/ppc/8xx_io/uart.c	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/8xx_io/uart.c	Tue Jun  5 14:37:17 2001
@@ -2771,7 +2771,7 @@
 					immap->im_ioport.iop_padir &= ~iobits;
 					immap->im_ioport.iop_paodr &= ~iobits;
 				}
-#endif
+#endif /* CONFIG_ALTSMC2 */
 
 				/* Connect the baud rate generator to the
 				 * SMC based upon index in rs_table.  Also
@@ -2825,7 +2825,7 @@
 
 			/* Install interrupt handler.
 			*/
-			cpm_install_handler(state->irq, rs_8xx_interrupt, info);
+			cpm_install_handler(state->irq, (void *)rs_8xx_interrupt, info);
 
 			/* Set up the baud rate generator.
 			*/
diff -Nru a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
--- a/arch/ppc/kernel/Makefile	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/kernel/Makefile	Tue Jun  5 14:37:17 2001
@@ -52,7 +52,7 @@
 endif
 obj-$(CONFIG_8xx)		+= m8xx_setup.o ppc8xx_pic.o
 ifeq ($(CONFIG_8xx),y)
-obj-$(CONFIG_PCI)		+= qspan_pci.c
+obj-$(CONFIG_PCI)		+= qspan_pci.o
 ifndef CONFIG_MATH_EMULATION
 obj-y				+= softemu8xx.o
 endif
diff -Nru a/arch/ppc/kernel/checks.c b/arch/ppc/kernel/checks.c
--- a/arch/ppc/kernel/checks.c	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/kernel/checks.c	Tue Jun  5 14:37:17 2001
@@ -19,6 +19,8 @@
 #include <asm/system.h>
 #include <asm/io.h>
 
+extern int printf (const char *fmt, ...);
+
 /*
  * Do various before compile checks of data structures
  * -- Cort
diff -Nru a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
--- a/arch/ppc/kernel/entry.S	Tue Jun  5 14:41:18 2001
+++ b/arch/ppc/kernel/entry.S	Tue Jun  5 14:41:18 2001
@@ -245,7 +245,7 @@
 	li	r5, 0x3980
 	stw	r5, 8(r6)
 	lwz	r5, 8(r6)
-#endif
+#endif /* CONFIG_8xx_CPU6 */
         mtspr   M_TWB,r9	/* Update MMU base address */
 	tlbia
 	sync
diff -Nru a/arch/ppc/kernel/irq.c b/arch/ppc/kernel/irq.c
--- a/arch/ppc/kernel/irq.c	Tue Jun  5 14:41:18 2001
+++ b/arch/ppc/kernel/irq.c	Tue Jun  5 14:41:18 2001
@@ -370,7 +370,7 @@
 {
 #ifdef CONFIG_APUS
 	return apus_get_irq_list (buf);
-#else
+#else /* !CONFIG_APUS */
 	int i, len = 0, j;
 	struct irqaction * action;

diff -Nru a/arch/ppc/kernel/m8xx_setup.c b/arch/ppc/kernel/m8xx_setup.c
--- a/arch/ppc/kernel/m8xx_setup.c	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/kernel/m8xx_setup.c	Tue Jun  5 14:37:17 2001
@@ -124,12 +124,6 @@
 extern unsigned long find_available_memory(void);
 extern void m8xx_cpm_reset(uint);
 
-static void ide_interrupt_handler(void* dev_id);
-
-void __init adbdev_init(void)
-{
-}
-
 void __init
 m8xx_setup_arch(void)
 {
@@ -359,6 +353,12 @@
 /*
  * IDE stuff.
  */
+#ifdef CONFIG_BLK_DEV_MPC8xx_IDE
+void ide_interrupt_handler (void *dev)
+{
+}
+#endif
+
 void
 m8xx_ide_insw(ide_ioreg_t port, void *buf, int ns)
 {
@@ -512,12 +512,7 @@
 
 #endif	/* CONFIG_BLK_DEV_MPC8xx_IDE */
 }
-#endif	/* CONFIG_BLK_DEV_IDE || CONFIG_BLK_DEV_IDE_MODULE */
-
-
-/* -------------------------------------------------------------------- */
 
-#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 #ifdef CONFIG_BLK_DEV_MPC8xx_IDE
 
 /* PCMCIA Timing */
@@ -577,13 +572,9 @@
 	if ((reg = pcmp->pcmc_por7 & mask) != 0)
 		pcmp->pcmc_por7 = reg | timing;
 }
-
-void ide_interrupt_handler (void *dev)
-{
-}
-
 #endif	/* CONFIG_BLK_DEV_MPC8xx_IDE */
 #endif	/* CONFIG_BLK_DEV_IDE || CONFIG_BLK_DEV_IDE_MODULE */
+
 /* -------------------------------------------------------------------- */
 
 /*
diff -Nru a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
--- a/arch/ppc/kernel/setup.c	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/kernel/setup.c	Tue Jun  5 14:37:17 2001
@@ -332,7 +332,7 @@
 		 * Assume here that all clock rates are the same in a
 		 * smp system.  -- Cort
 		 */
-#if !defined(CONFIG_4xx) && !defined(CONFIG_8xx) && !defined(CONFIG_8260)
+#if defined(CONFIG_ALL_PPC)
 		if ( have_of )
 		{
 			struct device_node *cpu_node;
@@ -356,7 +356,7 @@
 			len += sprintf(len+buffer, "clock\t\t: %dMHz\n",
 				       *fp / 1000000);
 		}
-#endif /* !CONFIG_4xx && !CONFIG_8xx */
+#endif /* CONFIG_ALL_PPC */
 
 		if (ppc_md.setup_residual != NULL)
 		{
@@ -810,7 +810,7 @@
 	ppc_md.setup_arch();
 	if ( ppc_md.progress ) ppc_md.progress("arch: exit", 0x3eab);
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_ALL_PPC)
 	/* We create the "pci-OF-bus-map" property now so it appear in the
 	 * /proc device tree
 	 */
@@ -826,7 +826,7 @@
 			prom_add_property(find_path_device("/"), of_prop);
 		}
 	}
-#endif /* CONFIG_PCI */
+#endif /* CONFIG_PCI && CONFIG_ALL_PPC */
 
 	paging_init();
 	sort_exception_table();
diff -Nru a/arch/ppc/xmon/Makefile b/arch/ppc/xmon/Makefile
--- a/arch/ppc/xmon/Makefile	Tue Jun  5 14:37:17 2001
+++ b/arch/ppc/xmon/Makefile	Tue Jun  5 14:37:17 2001
@@ -4,10 +4,11 @@
 
 O_TARGET	:= x.o
 
-ifeq ($(CONFIG_8xx),y)
-obj-y		:= start_8xx.o xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
+ifdef CONFIG_8xx
+obj-y		:= start_8xx.o
 else
-obj-y		:= start.o xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
+obj-y		:= start.o
 endif
+obj-y		+= xmon.o ppc-dis.o ppc-opc.o subr_prf.o setjmp.o
 
 include $(TOPDIR)/Rules.make
===== arch/ppc/8xx_io/commproc.c 1.11 vs edited =====
--- 1.11/arch/ppc/8xx_io/commproc.c	Thu May 31 03:04:00 2001
+++ edited/arch/ppc/8xx_io/commproc.c	Thu Jun  7 14:38:24 2001
@@ -110,7 +110,7 @@
 
 	/* Install our own error handler.
 	*/
-	cpm_install_handler(CPMVEC_ERROR, cpm_error_interrupt, NULL);
+	cpm_install_handler(CPMVEC_ERROR, (void *)cpm_error_interrupt, NULL);
 	((immap_t *)IMAP_ADDR)->im_cpic.cpic_cicr |= CICR_IEN;
 }
 
===== include/asm-ppc/processor.h 1.22 vs edited =====
--- 1.22/include/asm-ppc/processor.h	Tue Jun  5 04:45:22 2001
+++ edited/include/asm-ppc/processor.h	Thu Jun  7 15:04:58 2001
@@ -469,7 +469,8 @@
 #define	PVR_823		PVR_821
 #define	PVR_850		PVR_821
 #define	PVR_860		PVR_821
-#define	PVR_7400       	0x000C0000
+#define	PVR_7400	0x000C0000
+#define	PVR_7410	0x800C0000
 #define	PVR_8240	0x00810100
 #define	PVR_8260	PVR_8240