patch-2.3.99-pre2 linux/drivers/sbus/sbus.c

• Lines: 52
• Date: Thu Mar 16 11:40:17 2000
• Orig file: v2.3.99-pre1/linux/drivers/sbus/sbus.c
• Orig date: Wed Dec 29 13:13:18 1999

diff -u --recursive --new-file v2.3.99-pre1/linux/drivers/sbus/sbus.c linux/drivers/sbus/sbus.c
@@ -1,4 +1,4 @@
-/* $Id: sbus.c,v 1.83 1999/10/18 01:47:01 zaitcev Exp $
+/* $Id: sbus.c,v 1.86 2000/03/16 09:23:57 jj Exp $
  * sbus.c:  SBus support routines.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -205,6 +205,7 @@
 			this_dev->child = kmalloc(sizeof(struct sbus_dev),
 						  GFP_ATOMIC);
 			this_dev->child->bus = sbus;
+			this_dev->child->next = 0;
 			fill_sbus_device(prom_getchild(this_node), this_dev->child);
 			sbus_do_child_siblings(prom_getchild(this_node),
 					       this_dev->child, this_dev, sbus);
@@ -303,6 +304,8 @@
 	}
 }
 
+extern void register_proc_sparc_ioport(void);
+
 void __init sbus_init(void)
 {
 	int nd, this_sbus, sbus_devs, topnd, iommund;
@@ -310,7 +313,11 @@
 	struct sbus_bus *sbus;
 	struct sbus_dev *this_dev;
 	int num_sbus = 0;  /* How many did we find? */
-	
+
+#ifndef __sparc_v9__
+	register_proc_sparc_ioport();
+#endif
+
 #ifdef CONFIG_SUN4
 	return sun4_dvma_init();
 #endif
@@ -424,6 +431,7 @@
 						  GFP_ATOMIC);
 			/* Fill it */
 			this_dev->child->bus = sbus;
+			this_dev->child->next = 0;
 			fill_sbus_device(prom_getchild(sbus_devs),
 					 this_dev->child);
 			sbus_do_child_siblings(prom_getchild(sbus_devs),
@@ -453,6 +461,7 @@
 							  GFP_ATOMIC);
 				/* Fill it */
 				this_dev->child->bus = sbus;
+				this_dev->child->next = 0;
 				fill_sbus_device(prom_getchild(sbus_devs),
 						 this_dev->child);
 				sbus_do_child_siblings(prom_getchild(sbus_devs),