Index: stable/6/sys/i386/acpica/Makefile
===================================================================
--- stable/6/sys/i386/acpica/Makefile	(revision 163611)
+++ stable/6/sys/i386/acpica/Makefile	(revision 163612)
@@ -1,24 +1,30 @@
 # $FreeBSD$
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file
 .ifdef MAKESRCPATH
 .PATH: ${MAKESRCPATH}
 DEPENDFILE=
 .else
 MAKESRCPATH= ${.CURDIR}
 CLEANFILES= acpi_wakecode.h acpi_wakecode.bin acpi_wakecode.o
 .endif
-CFLAGS+=	-I. -I@
+.if ${CC} == "icc"
+CFLAGS+=	-restrict
+NOSTDINC=	-X
+.else
+NOSTDINC=	-nostdinc
+.endif
+CFLAGS+=	${NOSTDINC} -I. -I${MAKESRCPATH}/../..
 
 all: acpi_wakecode.h
 
-acpi_wakecode.o: acpi_wakecode.S
+acpi_wakecode.o: acpi_wakecode.S assym.s
 
 acpi_wakecode.bin: acpi_wakecode.o
 	objcopy -S -O binary acpi_wakecode.o acpi_wakecode.bin
 
 acpi_wakecode.h: acpi_wakecode.bin acpi_wakecode.o
 	sh ${MAKESRCPATH}/genwakecode.sh > acpi_wakecode.h
 
 .include <bsd.prog.mk>