5 files changed, 11 insertions, 10 deletions

diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index f9b44004b684..ae510cdb48b2 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
-.endif
-
-.if ${MACHINE} != "i386"
-.error "The ACPI module is only for i386"
+.if ${MACHINE} == "i386"
+SUBDIR=		acpi
 .endif
 
 SUBDIR= acpi acpi_asus acpi_fujitsu acpi_ibm acpi_panasonic acpi_sony \
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 79d37d2a288f..d58220ed191a 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -1,5 +1,13 @@
 # $FreeBSD$
 
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.error "ACPI can only be compiled into the kernel on the amd64 and ia64 platforms"
+.endif
+
+.if ${MACHINE} != "i386"
+.error "The ACPI module is only for i386"
+.endif
+
 .PATH: ${.CURDIR}/../../../contrib/dev/acpica \
        ${.CURDIR}/../../../pci \
        ${.CURDIR}/../../../dev/acpica \
diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile
index 5ee3ab44bfed..f262f05532a4 100644
--- a/sys/modules/acpi/acpi_video/Makefile
+++ b/sys/modules/acpi/acpi_video/Makefile
@@ -4,9 +4,8 @@
 
 KMOD=	acpi_video
 WARNS?=	2
-CFLAGS+= -I@/contrib/dev/acpica
+CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica
 SRCS=	acpi_video.c
 SRCS+=	opt_acpi.h acpi_if.h bus_if.h device_if.h
-NO_MAN=
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile
index 5429b9cee4db..885b983a8998 100644
--- a/sys/modules/i2c/controllers/alpm/Makefile
+++ b/sys/modules/i2c/controllers/alpm/Makefile
@@ -2,7 +2,6 @@
 
 .PATH:		${.CURDIR}/../../../../pci
 KMOD		= alpm
-CFLAGS		+= -DALPM_SMBIO_BASE_ADDR=0xbc00
 SRCS		= device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \
 		  alpm.c
 
diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile
index 300744146093..770a0b39cbde 100644
--- a/sys/modules/i2c/controllers/viapm/Makefile
+++ b/sys/modules/i2c/controllers/viapm/Makefile
@@ -4,6 +4,5 @@
 KMOD		= viapm
 SRCS		= device_if.h bus_if.h isa_if.h iicbb_if.h pci_if.h smbus_if.h \
 		  opt_isa.h viapm.c
-CFLAGS		+= -DVIAPM_BASE_ADDR=0x6000
 
 .include <bsd.kmod.mk>