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/adb.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/adb.c')
| -rw-r--r-- | sys/arch/macppc/dev/adb.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c index 1daef3c5eef..1529a6b90d1 100644 --- a/sys/arch/macppc/dev/adb.c +++ b/sys/arch/macppc/dev/adb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adb.c,v 1.11 2005/09/30 01:28:05 deraadt Exp $ */ +/* $OpenBSD: adb.c,v 1.12 2005/10/15 15:01:23 martin Exp $ */ /* $NetBSD: adb.c,v 1.6 1999/08/16 06:28:09 tsubai Exp $ */ /*- @@ -43,7 +43,6 @@ #include <machine/autoconf.h> #include <macppc/dev/adbvar.h> -#include <macppc/dev/adb_direct.h> #include <macppc/dev/akbdvar.h> #include <macppc/dev/viareg.h> @@ -124,7 +123,7 @@ adbattach(struct device *parent, struct device *self, void *aux) if (strcmp(ca->ca_name, "via-cuda") == 0) adbHardware = ADB_HW_CUDA; else if (strcmp(ca->ca_name, "via-pmu") == 0) - adbHardware = ADB_HW_PB; + adbHardware = ADB_HW_PMU; adb_polling = 1; ADBReInit(); @@ -149,7 +148,7 @@ adbattach(struct device *parent, struct device *self, void *aux) case ADB_HW_CUDA: printf(": via-cuda"); break; - case ADB_HW_PB: + case ADB_HW_PMU: printf(": via-pmu"); break; } |