Merged from sys/i386/apm/apm.c revision 1.121.

This commit is contained in:
Yoshihiro Takahashi 2001-04-01 06:34:12 +00:00
parent 2cfe5c8141
commit 3ed49ce8da
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=75052

View File

@ -750,7 +750,7 @@ apm_timeout(void *dummy)
if (sc->active == 1)
/* Run slightly more oftan than 1 Hz */
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1 );
apm_timeout_ch = timeout(apm_timeout, NULL, hz - 1);
}
/* enable APM BIOS */
@ -828,13 +828,14 @@ apm_probe(device_t dev)
int rid;
#endif
if (resource_int_value("apm", 0, "disabled", &disabled) == 0
&& disabled != 0)
return ENXIO;
device_set_desc(dev, "APM BIOS");
if ( device_get_unit(dev) > 0 ) {
if (resource_int_value("apm", 0, "disabled", &disabled) != 0)
disabled = 0;
if (disabled)
return ENXIO;
if (device_get_unit(dev) > 0) {
printf("apm: Only one APM driver supported.\n");
return ENXIO;
}