[parisc-linux-cvs] Another Cujo/Dino cleanup and Moved the parisc_init().

[Ryan Bradetich]

--nFreZHaLTZJo0R7j
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Hello all,

The attached does the following three things:
	* Dino/Cujo cleanup in /proc/ioports
	* Moves parisc_init() below proc_root_init() so /proc/bus/{runway|gsc}/ appear again.
	* Bumps the kernel to -pa52

-  Ryan

--nFreZHaLTZJo0R7j
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dino_proc.diff"

Index: Makefile
===================================================================
RCS file: /home/cvs/parisc/linux/Makefile,v
retrieving revision 1.163
diff -u -p -r1.163 Makefile
--- Makefile	2001/10/13 02:43:29	1.163
+++ Makefile	2001/10/13 03:51:40
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 9
-EXTRAVERSION = -pa51
+EXTRAVERSION = -pa52
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
Index: drivers/gsc/dino.c
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/gsc/dino.c,v
retrieving revision 1.41
diff -u -p -r1.41 dino.c
--- dino.c	2001/10/13 02:43:29	1.41
+++ dino.c	2001/10/13 03:51:40
@@ -832,7 +832,11 @@ dino_common_init(struct parisc_device *d
 
 	/* allocate I/O Port resource region */
 	res = &dino_dev->hba.io_space;
-	res->name = "Dino I/O Port space";
+	if(d->id.hversion == 0x680) {
+		res->name = "Dino";
+	} else {
+		res->name = "Cujo";
+	}
 	res->start = HBA_PORT_BASE(dino_dev->hba.hba_num);
 	res->end = res->start + (HBA_PORT_SPACE_SIZE - 1);
 	res->flags = IORESOURCE_IO; /* do not mark it busy ! */
Index: init/main.c
===================================================================
RCS file: /home/cvs/parisc/linux/init/main.c,v
retrieving revision 1.35
diff -u -p -r1.35 main.c
--- main.c	2001/10/09 00:20:40	1.35
+++ main.c	2001/10/13 03:51:40
@@ -589,12 +589,12 @@ asmlinkage void __init start_kernel(void
 #if defined(CONFIG_ARCH_S390)
 	ccwcache_init();
 #endif
-#ifdef CONFIG_PARISC
-	parisc_init();
-#endif
 	signals_init();
 #ifdef CONFIG_PROC_FS
 	proc_root_init();
+#endif
+#ifdef CONFIG_PARISC
+	parisc_init();
 #endif
 #if defined(CONFIG_SYSVIPC)
 	ipc_init();

--nFreZHaLTZJo0R7j--