[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/platforms pplus_setup.c,1.2,1.3 prep_setup.c,1.3,1.4 sandpoint_setup.c,1.2,1.3

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms
In directory usw-pr-cvs1:/tmp/cvs-serv23928/linux/arch/ppc/platforms

Modified Files:
	pplus_setup.c prep_setup.c sandpoint_setup.c 
Log Message:
Synced to 2.5.19

Index: pplus_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/pplus_setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pplus_setup.c	1 May 2002 18:07:50 -0000	1.2
+++ pplus_setup.c	3 Jun 2002 22:44:57 -0000	1.3
@@ -70,7 +70,6 @@
 #include <asm/todc.h>
 #include <asm/bootinfo.h>
 
-#undef CONFIG_SERIAL_TEXT_DEBUG
 #undef DUMP_DBATS
 
 TODC_ALLOC();
@@ -482,9 +481,7 @@
 
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
 	ppc_md.progress = pplus_progress;
-#else /* !CONFIG_SERIAL_TEXT_DEBUG */
-	ppc_md.progress = NULL;
-#endif /* CONFIG_SERIAL_TEXT_DEBUG */
+#endif
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 	ppc_ide_md.default_irq = pplus_ide_default_irq;

Index: prep_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/prep_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- prep_setup.c	16 May 2002 18:01:37 -0000	1.3
+++ prep_setup.c	3 Jun 2002 22:44:57 -0000	1.4
@@ -106,9 +106,6 @@
 {
 	extern char *Motherboard_map_name;
 	int cachew;
-#ifdef CONFIG_PREP_RESIDUAL
-	int i;
-#endif
 
 	seq_printf(m, "machine\t\t: PReP %s\n", Motherboard_map_name);
 
@@ -169,6 +166,8 @@
 no_l2:
 #ifdef CONFIG_PREP_RESIDUAL
 	if (res->ResidualLength != 0) {
+		int i;
+
 		/* print info about SIMMs */
 		seq_printf(m, "simms\t\t: ");
 		for (i = 0; (res->ActualNumMemories) && (i < MAX_MEMS); i++) {
@@ -801,8 +800,8 @@
 	io_block_mapping(0xf0000000, PREP_ISA_MEM_BASE, 0x08000000, _PAGE_IO);
 }
 
-static void __init
-prep_init2(void)
+static int __init
+prep_request_io(void)
 {
 #ifdef CONFIG_NVRAM
 	request_region(PREP_NVRAM_AS0, 0x8, "nvram");
@@ -811,8 +810,12 @@
 	request_region(0x40,0x20,"timer");
 	request_region(0x80,0x10,"dma page reg");
 	request_region(0xc0,0x20,"dma2");
+
+	return 0;
 }
 
+device_initcall(prep_request_io);
+
 void __init
 prep_init(unsigned long r3, unsigned long r4, unsigned long r5,
 		unsigned long r6, unsigned long r7)
@@ -852,7 +855,6 @@
 	ppc_md.init_IRQ       = prep_init_IRQ;
 	/* this gets changed later on if we have an OpenPIC -- Cort */
 	ppc_md.get_irq        = i8259_irq;
-	ppc_md.init           = prep_init2;
 
 	ppc_md.restart        = prep_restart;
 	ppc_md.power_off      = prep_power_off;

Index: sandpoint_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/platforms/sandpoint_setup.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sandpoint_setup.c	1 May 2002 18:07:50 -0000	1.2
+++ sandpoint_setup.c	3 Jun 2002 22:44:57 -0000	1.3
@@ -6,7 +6,7 @@
  * Author: Mark A. Greer
  *         mg...@mv...
  *
- * Copyright 2000, 2001 MontaVista Software Inc.
+ * Copyright 2000-2002 MontaVista Software Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -71,7 +71,6 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/ide.h>
-#include <linux/irq.h>
 #include <linux/seq_file.h>
 
 #include <asm/system.h>
@@ -169,7 +168,7 @@
 #endif
 
 	printk("Motorola SPS Sandpoint Test Platform\n");
-	printk("Sandpoint port (C) 2000, 2001 MontaVista Software, Inc. (so...@mv...)\n");
+	printk("Sandpoint port (MontaVista Software, Inc. (so...@mv...))\n");
 
 	/* The Sandpoint rom doesn't enable any caches.  Do that now.
 	 * The 7450 portion will also set up the L3s once I get enough