svn commit: r280856 - stable/10/sys/amd64/conf

[John Baldwin]

Author: jhb
Date: Mon Mar 30 16:28:04 2015
New Revision: 280856
URL: https://svnweb.freebsd.org/changeset/base/280856

Log:
  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.

Modified:
  stable/10/sys/amd64/conf/GENERIC

Modified: stable/10/sys/amd64/conf/GENERIC
==============================================================================
--- stable/10/sys/amd64/conf/GENERIC	Mon Mar 30 15:29:06 2015	(r280855)
+++ stable/10/sys/amd64/conf/GENERIC	Mon Mar 30 16:28:04 2015	(r280856)
@@ -84,7 +84,6 @@ options 	SMP			# Symmetric MultiProcesso
 device		cpufreq
 
 # Bus support.
-device		hwpmc
 device		acpi
 options 	ACPI_DMAR
 device		pci