Move acpi_perf and acpi_throttle into acpi.ko. Remove the acpi_perf

build structure.

3 files changed, 3 insertions, 15 deletions

diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile
index 26d1aed..5bc8a99 100644
--- a/sys/modules/acpi/Makefile
+++ b/sys/modules/acpi/Makefile
@@ -8,7 +8,7 @@
 .error "The ACPI module is only for i386"
 .endif
 
-SUBDIR= acpi acpi_asus acpi_ibm acpi_panasonic acpi_perf acpi_sony \
+SUBDIR= acpi acpi_asus acpi_ibm acpi_panasonic acpi_sony \
 	acpi_toshiba acpi_video
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile
index 3152685..17a4323 100644
--- a/sys/modules/acpi/acpi/Makefile
+++ b/sys/modules/acpi/acpi/Makefile
@@ -42,14 +42,14 @@ SRCS+=	acpi_timer.c acpi_pci_link.c acpi_thermal.c
 
 # ACPI hardware drivers, mostly used for mobile systems.
 SRCS+=	acpi_acad.c acpi_battery.c acpi_cmbat.c acpi_cpu.c
-SRCS+=	acpi_ec.c acpi_lid.c
+SRCS+=	acpi_ec.c acpi_lid.c acpi_perf.c acpi_throttle.c
 
 # OSD layer
 SRCS+=	OsdDebug.c 
 SRCS+=	OsdHardware.c OsdInterrupt.c OsdMemory.c OsdSchedule.c
 SRCS+=	OsdStream.c OsdSynch.c OsdTable.c OsdEnvironment.c 
 SRCS+=	opt_acpi.h opt_bus.h opt_ddb.h
-SRCS+=	acpi_if.h acpi_quirks.h bus_if.h device_if.h
+SRCS+=	acpi_if.h acpi_quirks.h bus_if.h cpufreq_if.h device_if.h
 SRCS+=	isa_if.h pci_if.h pcib_if.h
 
 # Debugging support
diff --git a/sys/modules/acpi/acpi_perf/Makefile b/sys/modules/acpi/acpi_perf/Makefile
deleted file mode 100644
index 4ae17af..0000000
--- a/sys/modules/acpi/acpi_perf/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH:		${.CURDIR}/../../../dev/acpica
-CFLAGS+=	-I${.CURDIR}/../../../contrib/dev/acpica
-
-KMOD=		acpi_perf
-WARNS?=		2
-SRCS=		acpi_perf.c acpi_throttle.c
-SRCS+=		acpi_if.h bus_if.h cpufreq_if.h device_if.h opt_acpi.h \
-		pci_if.h
-
-.include <bsd.kmod.mk>