diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-15 15:01:24 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-10-15 15:01:24 +0000 |
| commit | 076ae79138725d72f6452f24a57d9c22a197f43f (patch) | |
| tree | 6a57e1d9fbc74b0dd2560c863b11f69d6eacc94a /sys/arch/macppc/dev/apm.c | |
| parent | 35706a64087bc831698cbed0cae4398b84d841c5 (diff) | |
- merge adb_direct.h bits into adbvar.h
- rename ADB_HW_PB to ADB_HW_PMU
from NetBSD
ok brad@; additonal testing krw@
Diffstat (limited to 'sys/arch/macppc/dev/apm.c')
| -rw-r--r-- | sys/arch/macppc/dev/apm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c index 3b563fd0987..41d90969592 100644 --- a/sys/arch/macppc/dev/apm.c +++ b/sys/arch/macppc/dev/apm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apm.c,v 1.10 2005/03/29 14:32:57 miod Exp $ */ +/* $OpenBSD: apm.c,v 1.11 2005/10/15 15:01:23 martin Exp $ */ /*- * Copyright (c) 2001 Alexander Guy. All rights reserved. @@ -55,7 +55,6 @@ #include <machine/apmvar.h> #include <macppc/dev/adbvar.h> -#include <macppc/dev/adb_direct.h> #include <macppc/dev/pm_direct.h> #if defined(APMDEBUG) @@ -121,7 +120,7 @@ apmmatch(struct device *parent, void *match, void *aux) aa->adbaddr != ADBADDR_APM) return 0; - if (adbHardware != ADB_HW_PB) + if (adbHardware != ADB_HW_PMU) return 0; return 1; |