From 72ef934bda205fc59fa2f5466f78d68301505f95 Mon Sep 17 00:00:00 2001
From: Artur Grabowski <art@cvs.openbsd.org>
Date: Sat, 5 May 2001 22:34:36 +0000
Subject: Rename configure() to cpu_configure(). Move it from cpu_startup() to
 main().

---
 sys/arch/hppa/hppa/autoconf.c    | 6 +++---
 sys/arch/hppa/hppa/machdep.c     | 3 +--
 sys/arch/hppa/include/autoconf.h | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'sys/arch/hppa')

diff --git a/sys/arch/hppa/hppa/autoconf.c b/sys/arch/hppa/hppa/autoconf.c
index 7b095626d77..4fa24058b42 100644
--- a/sys/arch/hppa/hppa/autoconf.c
+++ b/sys/arch/hppa/hppa/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.13 2001/04/01 06:25:33 mickey Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.14 2001/05/05 22:33:39 art Exp $	*/
 
 /*
  * Copyright (c) 1998-2001 Michael Shalayeff
@@ -80,11 +80,11 @@ extern int hz;
 #endif
 
 /*
- * configure:
+ * cpu_configure:
  * called at boot time, configure all devices on system
  */
 void
-configure()
+cpu_configure()
 {
 	extern int cold;
 
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index a6777000f3e..90ed27ba5b8 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.32 2001/05/05 20:56:36 art Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.33 2001/05/05 22:33:40 art Exp $	*/
 
 /*
  * Copyright (c) 1999-2000 Michael Shalayeff
@@ -704,7 +704,6 @@ cpu_startup()
 		printf("kernel does not support -c; continuing..\n");
 #endif
 	}
-	configure();
 }
 
 /*
diff --git a/sys/arch/hppa/include/autoconf.h b/sys/arch/hppa/include/autoconf.h
index 522541e82b7..61a1989e168 100644
--- a/sys/arch/hppa/include/autoconf.h
+++ b/sys/arch/hppa/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.9 1999/08/16 02:48:40 mickey Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.10 2001/05/05 22:33:42 art Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -66,5 +66,4 @@ void	*cpu_intr_establish __P((int pri, int, int (*handler) __P((void *)),
 				void *arg, struct device *name));
 int	clock_intr __P((void *));
 
-void	configure	__P((void));
 void	dumpconf	__P((void));
-- 
cgit v1.2.3