summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2003-08-20 21:44:04 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2003-08-20 21:44:04 +0000
commitd866624f5a97329536d0cbbd5cf17d5cccdf26aa (patch)
tree8e37b331bdcfbf723989de3ba339d36cdc6e8a5b
parent9e32a480c63f3aa4409f83592a942d64de8c360f (diff)
allow powerless kernels
-rw-r--r--sys/arch/hppa/conf/files.hppa4
-rw-r--r--sys/arch/hppa/hppa/mainbus.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index babfc99cbe5..7c1a360feb8 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: files.hppa,v 1.47 2003/08/20 20:55:59 mickey Exp $
+# $OpenBSD: files.hppa,v 1.48 2003/08/20 21:44:03 mickey Exp $
#
# hppa-specific configuration info
@@ -77,7 +77,7 @@ file arch/hppa/dev/pdc.c pdc
device power
attach power at mainbus
-file arch/hppa/dev/power.c power
+file arch/hppa/dev/power.c power needs-flag
device mem
attach mem at mainbus
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c
index f8c995ad96a..43f6dca1567 100644
--- a/sys/arch/hppa/hppa/mainbus.c
+++ b/sys/arch/hppa/hppa/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.49 2003/08/20 20:53:31 mickey Exp $ */
+/* $OpenBSD: mainbus.c,v 1.50 2003/08/20 21:44:03 mickey Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -31,6 +31,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "power.h"
#undef BTLBDEBUG
@@ -1010,9 +1011,11 @@ mbattach(parent, self, aux)
nca.ca_dmatag = &hppa_dmatag;
config_found(self, &nca, mbprint);
+#if NPOWER > 0
/* get some power */
nca.ca_name = "power";
config_found(self, &nca, mbprint);
+#endif
bzero (&nca, sizeof(nca));
nca.ca_name = "mainbus";