acpi extra driver

[takawata at jp.freebsd.org]

In message <20061215103747.GA35194 at svm.csie.ntu.edu.tw>, Rong-En Fan wrote:
>
>--tThc/1wpZn/ma/RB
>Content-Type: text/plain; charset=us-ascii
>Content-Disposition: inline
>Content-Transfer-Encoding: quoted-printable
>
>It seems that all acpi_support/acpi_* drivers are listed in
>machine-independent file, i.e. conf/files. But they are only
>appear in i386's NOTES. Well, I know that all these driver=20
>only appear on i386 before. But now we have some laptop with
>x86-64 cpus, like ThinkPad X60. Shall we list these drivers in
>amd64/NOTES, too?

I think it's OK. And we may want to hook acpi extras kernel module for
AMD64 or IA64.
How about this patch?

Index: Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/acpi/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- Makefile	10 Nov 2006 20:06:03 -0000	1.51
+++ Makefile	15 Dec 2006 10:56:28 -0000
@@ -1,14 +1,10 @@
 # $FreeBSD: src/sys/modules/acpi/Makefile,v 1.51 2006/11/10 20:06:03 emaste Exp $
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.error "ACPI must be compiled in (not built as a module) on amd64 and ia64"
+.if ${MACHINE} == "i386"
+SUBDIR= acpi
 .endif
 
-.if ${MACHINE} != "i386"
-.error "The ACPI module is only for i386"
-.endif
-
-SUBDIR= acpi acpi_aiboost acpi_asus acpi_fujitsu acpi_ibm  \
+SUBDIR+= acpi_aiboost acpi_asus acpi_fujitsu acpi_ibm  \
 	acpi_panasonic acpi_sony acpi_toshiba acpi_video acpi_dock
 
 .include <bsd.subdir.mk>
Index: acpi/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/acpi/acpi/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- acpi/Makefile	30 May 2006 09:38:53 -0000	1.16
+++ acpi/Makefile	15 Dec 2006 10:52:05 -0000
@@ -1,5 +1,10 @@
 # $FreeBSD: src/sys/modules/acpi/acpi/Makefile,v 1.16 2006/05/30 09:38:53 ru Exp $
 
+.if ${MACHINE} != "i386"
+.error "The ACPI module is only for i386"
+.endif
+
+
 .PATH: ${.CURDIR}/../../../contrib/dev/acpica \
        ${.CURDIR}/../../../pci \
        ${.CURDIR}/../../../dev/acpica \