28c28
< __FBSDID("$FreeBSD: head/sys/i386/acpica/acpi_machdep.c 128932 2004-05-04 21:04:24Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/i386/acpica/acpi_machdep.c 128975 2004-05-05 19:51:15Z njl $");
39d38
<
49,51d47
< #if __FreeBSD_version < 500000
< #include <sys/select.h>
< #else
53d48
< #endif
58,60d52
< #if __FreeBSD_version < 500000
< #include <i386/apm/apm.h>
< #else
62d53
< #endif
64c55
< u_int32_t acpi_reset_video = 1;
---
> uint32_t acpi_reset_video = 1;
66a58
> static int intr_model = ACPI_INTR_PIC;
86,87d77
< static int intr_model = ACPI_INTR_PIC;
<
108c98
< if (battp->cap >= 50) {
---
> if (battp->cap >= 50)
110c100
< } else {
---
> else
112d101
< }
125c114
< if (battp->cap >= 50) {
---
> if (battp->cap >= 50)
127c116
< } else {
---
> else {
181c170
< (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL)) {
---
> (app->ap_device < PMDV_BATT0 || app->ap_device > PMDV_BATT_ALL))
183d171
< }