From c6250ecfd716691c21ba6435f6cd98fd1bfdef59 Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Thu, 24 Feb 2005 20:48:07 +0000 Subject: [PATCH] Move acpi_perf and acpi_throttle into acpi.ko. Remove the acpi_perf build structure. --- sys/conf/files | 4 ++-- sys/modules/acpi/Makefile | 2 +- sys/modules/acpi/acpi/Makefile | 4 ++-- sys/modules/acpi/acpi_perf/Makefile | 12 ------------ 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 sys/modules/acpi/acpi_perf/Makefile diff --git a/sys/conf/files b/sys/conf/files index 22d35e429b56..ee782a9ab18c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -339,12 +339,12 @@ dev/acpica/acpi_pci_link.c optional acpi pci dev/acpica/acpi_pcib.c optional acpi pci dev/acpica/acpi_pcib_acpi.c optional acpi pci dev/acpica/acpi_pcib_pci.c optional acpi pci -dev/acpica/acpi_perf.c optional acpi_perf acpi +dev/acpica/acpi_perf.c optional acpi dev/acpica/acpi_powerres.c optional acpi dev/acpica/acpi_quirk.c optional acpi dev/acpica/acpi_resource.c optional acpi dev/acpica/acpi_thermal.c optional acpi -dev/acpica/acpi_throttle.c optional acpi_perf acpi +dev/acpica/acpi_throttle.c optional acpi dev/acpica/acpi_timer.c optional acpi dev/acpica/acpi_video.c optional acpi_video acpi dev/adlink/adlink.c optional adlink diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index 26d1aede7e38..5bc8a990be54 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 diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index 3152685275a0..17a43235c9be 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 4ae17af83ae2..000000000000 --- 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