GENERIC kernel build fails at ACPI

[Ben Washington-Yule]

6-STABLE. Here's the relative part from the script file.

Thanks.
===============================================================

cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE 
-nostdinc -I- 
-I/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica 
-DHAVE_KERNEL_OPTION_HEADERS -include 
/usr/obj/usr/src/sys/GENERIC/opt_global.h -I. -I@ -I@/contrib/altq 
-I@/../include -finline-limit=8000 -fno-common -g 
-I/usr/obj/usr/src/sys/GENERIC -mno-align-long-strings 
-mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2 
-ffreestanding -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline 
-Wcast-qual  -fformat-extensions -std=c99 -Wsystem-headers -Werror -Wall 
-Wno-format-y2k -Wno-uninitialized -c 
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_ec.c
cc -O2 -fno-strict-aliasing -pipe -Werror -D_KERNEL -DKLD_MODULE 
-nostdinc -I- 
-I/usr/src/sys/modules/acpi/acpi/../../../contrib/dev/acpica 
-DHAVE_KERNEL_OPTION_HEADERS -include 
/usr/obj/usr/src/sys/GENERIC/opt_global.h -I. -I@ -I@/contrib/altq 
-I@/../include -finline-limit=8000 -fno-common -g 
-I/usr/obj/usr/src/sys/GENERIC -mno-align-long-strings 
-mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse -mno-sse2 
-ffreestanding -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Winline 
-Wcast-qual  -fformat-extensions -std=c99 -Wsystem-headers -Werror -Wall 
-Wno-format-y2k -Wno-uninitialized -c 
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c: In 
function `acpi_hpet_table_probe':
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:89: 
error: `ACPI_TABLE_HPET' undeclared (first use in this function)
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:89: 
error: (Each undeclared identifier is reported only once
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:89: 
error: for each function it appears in.)
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:89: 
error: `hpet' undeclared (first use in this function)
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:96: 
error: `ACPI_SIG_HPET' undeclared (first use in this function)
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:96: 
warning: passing arg 3 of `AcpiGetTable' from incompatible pointer type
/usr/src/sys/modules/acpi/acpi/../../../dev/acpica/acpi_hpet.c:104: 
error: syntax error before ')' token
*** Error code 1

Stop in /usr/src/sys/modules/acpi/acpi.
*** Error code 1

Stop in /usr/src/sys/modules/acpi.
*** Error code 1

Stop in /usr/src/sys/modules.
*** Error code 1

Stop in /usr/obj/usr/src/sys/GENERIC.
*** Error code 1

Stop in /usr/src.
*** Error code 1

Stop in /usr/src.