Updated acpi-0228 diff

[Florian Smeets]

Nate Lawson wrote:

> Please test this.  There is a known problem with ia64 that is being worked


Hi Nate,

it doesn't seem to compile for me. Did im miss someting or is it a 
general problem.

===> acpi
cc -O -pipe -mcpu=pentiumpro 
-I/usr/src/sys/modules/acpi/../../contrib/dev/acpica  -D_KERNEL -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes 
-Wmissing-prototypes -Wp
ointer-arith -Winline -Wcast-qual  -fformat-extensions -ansi 
-DKLD_MODULE -nostdinc -I- 
-I/usr/src/sys/modules/acpi/../../contrib/dev/acpica -I. -I@ -I@/dev 
-I@/../include -fno-c
ommon -g -mno-align-long-strings -mpreferred-stack-boundary=2 
-ffreestanding -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Wi
nline -Wcast-qual  -fformat-extensions -ansi -c 
/usr/src/sys/contrib/dev/acpica/dsfield.c
cc -O -pipe -mcpu=pentiumpro 
-I/usr/src/sys/modules/acpi/../../contrib/dev/acpica  -D_KERNEL -Wall 
-Wredundant-decls -Wnested-externs -Wstrict-prototypes 
-Wmissing-prototypes -Wp
ointer-arith -Winline -Wcast-qual  -fformat-extensions -ansi 
-DKLD_MODULE -nostdinc -I- 
-I/usr/src/sys/modules/acpi/../../contrib/dev/acpica -I. -I@ -I@/dev 
-I@/../include -fno-c
ommon -g -mno-align-long-strings -mpreferred-stack-boundary=2 
-ffreestanding -Wall -Wredundant-decls -Wnested-externs 
-Wstrict-prototypes  -Wmissing-prototypes -Wpointer-arith -Wi
nline -Wcast-qual  -fformat-extensions -ansi -c 
/usr/src/sys/contrib/dev/acpica/dsinit.c
/usr/src/sys/contrib/dev/acpica/dsinit.c:469: redefinition of 
`AcpiDsInitOneObject'
/usr/src/sys/contrib/dev/acpica/dsinit.c:153: `AcpiDsInitOneObject' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:593: redefinition of 
`AcpiDsInitializeObjects'
/usr/src/sys/contrib/dev/acpica/dsinit.c:277: `AcpiDsInitializeObjects' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:785: redefinition of 
`AcpiDsInitOneObject'
/usr/src/sys/contrib/dev/acpica/dsinit.c:469: `AcpiDsInitOneObject' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:909: redefinition of 
`AcpiDsInitializeObjects'
/usr/src/sys/contrib/dev/acpica/dsinit.c:593: `AcpiDsInitializeObjects' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:1101: redefinition of 
`AcpiDsInitOneObject'
/usr/src/sys/contrib/dev/acpica/dsinit.c:785: `AcpiDsInitOneObject' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:1225: redefinition of 
`AcpiDsInitializeObjects'
/usr/src/sys/contrib/dev/acpica/dsinit.c:909: `AcpiDsInitializeObjects' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:1417: redefinition of 
`AcpiDsInitOneObject'
/usr/src/sys/contrib/dev/acpica/dsinit.c:1101: `AcpiDsInitOneObject' 
previously defined here
/usr/src/sys/contrib/dev/acpica/dsinit.c:1541: redefinition of 
`AcpiDsInitializeObjects'
/usr/src/sys/contrib/dev/acpica/dsinit.c:1225: `AcpiDsInitializeObjects' 
previously defined here
*** 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/FLO.
*** Error code 1

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

Let me know if you need aditional information.

flo