Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/acpi/files.acpi,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/acpi/files.acpi,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.84.2.1
retrieving revision 1.85
diff -u -p -r1.84.2.1 -r1.85
--- src/sys/dev/acpi/files.acpi	2011/06/06 09:07:42	1.84.2.1
+++ src/sys/dev/acpi/files.acpi	2011/01/17 15:49:13	1.85
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.84.2.1 2011/06/06 09:07:42 jruoho Exp $
+#	$NetBSD: files.acpi,v 1.85 2011/01/17 15:49:13 jmcneill Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
@@ -59,6 +59,14 @@ device	acpibat: sysmon_envsys
 attach	acpibat at acpinodebus
 file	dev/acpi/acpi_bat.c		acpibat
 
+# ACPI CPU
+device	acpicpu
+attach	acpicpu at acpinodebus
+file	dev/acpi/acpi_cpu.c		acpicpu
+file	dev/acpi/acpi_cpu_cstate.c	acpicpu
+file	dev/acpi/acpi_cpu_pstate.c	acpicpu
+file	dev/acpi/acpi_cpu_tstate.c	acpicpu
+
 # ACPI Display
 device	acpivga {}
 attach	acpivga at acpinodebus
@@ -82,7 +90,7 @@ attach	acpitz at acpinodebus
 file	dev/acpi/acpi_tz.c		acpitz
 
 # ACPI Watchdog Timer
-device	acpiwdrt: sysmon_wdog
+device	acpiwdrt
 attach	acpiwdrt at acpiwdrtbus
 file	dev/acpi/acpi_wdrt.c		acpiwdrt
 
@@ -190,14 +198,11 @@ device	acpismbus: i2cbus
 attach	acpismbus at acpinodebus
 file	dev/acpi/smbus_acpi.c		acpismbus
 
-# Fujitsu Brightness & Pointer
+# Fujitsu Brightness, Pointer and Hotkeys
 device	fujbp
 attach	fujbp at acpinodebus
-file	dev/acpi/fujbp_acpi.c		fujbp
-
-# Fujitsu Hotkeys
 device	fujhk: sysmon_power
 attach	fujhk at acpinodebus
-file	dev/acpi/fujhk_acpi.c		fujhk
+file	dev/acpi/fujitsu_acpi.c		fujbp|fujhk
 
 include	"dev/acpi/wmi/files.wmi"