summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2015-10-14 18:53:34 +0000
committerbz <bz@FreeBSD.org>2015-10-14 18:53:34 +0000
commita1c8ec00371288bfc12465e841eb4feb2c093ef5 (patch)
treec8129c06f9dd950588b99570248403871c4e479e /sys/conf
parente2d907351f884aa4c384974429600841ad1f7414 (diff)
downloadFreeBSD-src-a1c8ec00371288bfc12465e841eb4feb2c093ef5.zip
FreeBSD-src-a1c8ec00371288bfc12465e841eb4feb2c093ef5.tar.gz
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.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.arm2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 9841082..85830bb 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -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
OpenPOWER on IntegriCloud