diff options
| author | peter <peter@FreeBSD.org> | 2001-01-19 14:09:54 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-19 14:09:54 +0000 |
| commit | 802c02830905f75c53f335d7938b97d0120f738e (patch) | |
| tree | fd5bd6b1029f6c6a521208c6e0d55e1705bf2eab /sys/pc98 | |
| parent | 91d167d573b821562968d96a4b54bde071974c30 (diff) | |
| download | FreeBSD-src-802c02830905f75c53f335d7938b97d0120f738e.zip FreeBSD-src-802c02830905f75c53f335d7938b97d0120f738e.tar.gz | |
Convert apm from a bogus 'count' into a plain option. Clean out some
other cruft from the files.alpha and files.ia64 that were related to this.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 6 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 6 | ||||
| -rw-r--r-- | sys/pc98/pc98/clock.c | 6 | ||||
| -rw-r--r-- | sys/pc98/pc98/syscons.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index 303f38a..3acf9a4 100644 --- a/sys/pc98/cbus/clock.c +++ b/sys/pc98/cbus/clock.c @@ -53,7 +53,7 @@ */ #include "opt_clock.h" -#include "apm.h" +#include "opt_apm.h" #include <sys/param.h> #include <sys/systm.h> @@ -988,7 +988,7 @@ startrtclock() * Curse Intel for leaving the counter out of the I/O APIC. */ -#if NAPM > 0 +#ifdef DEV_APM /* * We can not use the TSC if we support APM. Precise timekeeping * on an APM'ed machine is at best a fools pursuit, since @@ -1005,7 +1005,7 @@ startrtclock() if (disabled == 0) return; } -#endif /* NAPM > 0 */ +#endif /* DEV_APM */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { tsc_timecounter.tc_frequency = tsc_freq; diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c index 303f38a..3acf9a4 100644 --- a/sys/pc98/cbus/pcrtc.c +++ b/sys/pc98/cbus/pcrtc.c @@ -53,7 +53,7 @@ */ #include "opt_clock.h" -#include "apm.h" +#include "opt_apm.h" #include <sys/param.h> #include <sys/systm.h> @@ -988,7 +988,7 @@ startrtclock() * Curse Intel for leaving the counter out of the I/O APIC. */ -#if NAPM > 0 +#ifdef DEV_APM /* * We can not use the TSC if we support APM. Precise timekeeping * on an APM'ed machine is at best a fools pursuit, since @@ -1005,7 +1005,7 @@ startrtclock() if (disabled == 0) return; } -#endif /* NAPM > 0 */ +#endif /* DEV_APM */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { tsc_timecounter.tc_frequency = tsc_freq; diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c index 303f38a..3acf9a4 100644 --- a/sys/pc98/pc98/clock.c +++ b/sys/pc98/pc98/clock.c @@ -53,7 +53,7 @@ */ #include "opt_clock.h" -#include "apm.h" +#include "opt_apm.h" #include <sys/param.h> #include <sys/systm.h> @@ -988,7 +988,7 @@ startrtclock() * Curse Intel for leaving the counter out of the I/O APIC. */ -#if NAPM > 0 +#ifdef DEV_APM /* * We can not use the TSC if we support APM. Precise timekeeping * on an APM'ed machine is at best a fools pursuit, since @@ -1005,7 +1005,7 @@ startrtclock() if (disabled == 0) return; } -#endif /* NAPM > 0 */ +#endif /* DEV_APM */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { tsc_timecounter.tc_frequency = tsc_freq; diff --git a/sys/pc98/pc98/syscons.c b/sys/pc98/pc98/syscons.c index 554432d..adb0e7c 100644 --- a/sys/pc98/pc98/syscons.c +++ b/sys/pc98/pc98/syscons.c @@ -32,7 +32,7 @@ #include "opt_syscons.h" #include "opt_ddb.h" #ifdef __i386__ -#include "apm.h" +#include "opt_apm.h" #endif #include <sys/param.h> @@ -3134,7 +3134,7 @@ next_code: #endif break; -#if NAPM > 0 +#ifdef DEV_APM case SUSP: apm_suspend(PMST_SUSPEND); break; |
