summaryrefslogtreecommitdiffstats
path: root/sys/amd64/conf/GENERIC
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2015-03-30 16:28:04 +0000
committerjhb <jhb@FreeBSD.org>2015-03-30 16:28:04 +0000
commitec839daca29f4764970ab4a4985b0221bf5e0264 (patch)
treefbf6273282e16fd3cb812e07e63fd72e8b492e81 /sys/amd64/conf/GENERIC
parent3e11976044f532ef483da0eb314ce7957b524c5f (diff)
downloadFreeBSD-src-ec839daca29f4764970ab4a4985b0221bf5e0264.zip
FreeBSD-src-ec839daca29f4764970ab4a4985b0221bf5e0264.tar.gz
Revert accidental(?) change in r280455 and do not compile hwpmc statically
into GENERIC by default. This change is not present in HEAD and was not made in the two commits to HEAD that r280455 merged.
Diffstat (limited to 'sys/amd64/conf/GENERIC')
-rw-r--r--sys/amd64/conf/GENERIC1
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 4a2df33..03a0f9f 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -84,7 +84,6 @@ options SMP # Symmetric MultiProcessor Kernel
device cpufreq
# Bus support.
-device hwpmc
device acpi
options ACPI_DMAR
device pci
OpenPOWER on IntegriCloud