[Linuxconsole-commit]CVS: ruby/linux/arch/ppc/kernel ppc4xx_setup.c,1.5,1.6 setup.c,1.4,1.5

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

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

Modified Files:
	ppc4xx_setup.c setup.c 
Log Message:
Synced to 2.5.26

Index: ppc4xx_setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/ppc4xx_setup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ppc4xx_setup.c	12 Jul 2002 17:17:52 -0000	1.5
+++ ppc4xx_setup.c	23 Jul 2002 19:18:48 -0000	1.6
@@ -21,7 +21,6 @@
  *	used for all other board specific instructions needed during
  *	platform_init.
  *	moved RTC to board.c files
- *	moved VT/FB to board.c files
  *	moved r/w4 ide to redwood.c
  *
  */
@@ -58,6 +57,7 @@
 /* Function Prototypes */
 extern void abort(void);
 extern void ppc4xx_find_bridges(void);
+
 extern void ppc4xx_wdt_heartbeat(void);
 extern int wdt_enable;
 extern unsigned long wdt_period;
@@ -74,17 +74,10 @@
 static void __init
 ppc4xx_setup_arch(void)
 {
-
 	/* Setup PCI host bridges */
-
 #ifdef CONFIG_PCI
 	ppc4xx_find_bridges();
 #endif
-
-#if defined(CONFIG_FB)
-	conswitchp = &dummy_con;
-#endif
-
 	board_setup_arch();
 }
 

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/ppc/kernel/setup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- setup.c	22 Jun 2002 17:50:58 -0000	1.4
+++ setup.c	23 Jul 2002 19:18:48 -0000	1.5
@@ -81,10 +81,6 @@
 		unsigned long r5, unsigned long r6, unsigned long r7);
 #endif /* CONFIG_ALL_PPC */
 
-#ifdef CONFIG_MAGIC_SYSRQ
-unsigned long SYSRQ_KEY;
-#endif /* CONFIG_MAGIC_SYSRQ */
-
 #ifdef CONFIG_VGA_CONSOLE
 unsigned long vgacon_remap_base;
 #endif