svn commit: r289328 - head/sys/conf

[Bjoern A. Zeeb]

Author: bz
Date: Wed Oct 14 18:53:34 2015
New Revision: 289328
URL: https://svnweb.freebsd.org/changeset/base/289328

Log:
  Revert r289319 as it seems some ARM kernels include HWPMC but no FDT.
  To me that seems broken as certain interrupts will never be handled
  properly.  I'll re-open D3877 and we can seek a better solution and
  try again.  For now go back to that state and avoid compile time errors.

Modified:
  head/sys/conf/files.arm

Modified: head/sys/conf/files.arm
==============================================================================
--- head/sys/conf/files.arm	Wed Oct 14 18:32:06 2015	(r289327)
+++ head/sys/conf/files.arm	Wed Oct 14 18:53:34 2015	(r289328)
@@ -56,7 +56,7 @@ arm/arm/platform_if.m		optional	platform
 arm/arm/pmap.c			optional	!armv6
 arm/arm/pmap-v6.c		optional	armv6 !arm_new_pmap
 arm/arm/pmap-v6-new.c		optional	armv6 arm_new_pmap
-arm/arm/pmu.c			optional	pmu | hwpmc
+arm/arm/pmu.c			optional	pmu
 arm/arm/sc_machdep.c		optional	sc
 arm/arm/setcpsr.S		standard
 arm/arm/setstack.s		standard