summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-04-02 19:51:29 +0000
committerian <ian@FreeBSD.org>2014-04-02 19:51:29 +0000
commit82709f9ad7db31e58c8558504a43e2ec1e29944c (patch)
tree34e2900a25af6655f88c6445f403e7b72d5fe134 /sys/conf
parentfce983ceac31447515c52e6825593f26000e7cdf (diff)
downloadFreeBSD-src-82709f9ad7db31e58c8558504a43e2ec1e29944c.zip
FreeBSD-src-82709f9ad7db31e58c8558504a43e2ec1e29944c.tar.gz
Change NO_EVENTTIMERS from an arm-specific to an MI option, so that it can
be used in MI code. This is intended as a temporary measure to unbreak the build. The real fix is to write event timer drivers for legacy arm hardware, then get rid of this option completely. That's going to take a few days.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/options1
-rw-r--r--sys/conf/options.arm1
2 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/options b/sys/conf/options
index 75fe424..c91929b 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -159,6 +159,7 @@ NEW_PCIB opt_global.h
NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h
NO_ADAPTIVE_RWLOCKS
NO_ADAPTIVE_SX
+NO_EVENTTIMERS opt_timer.h
NO_SYSCTL_DESCR opt_global.h
NSWBUF_MIN opt_swap.h
MBUF_PACKET_ZONE_DISABLE opt_global.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 7b03ac8..4df2b9d 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -30,7 +30,6 @@ KERNPHYSADDR opt_global.h
KERNVIRTADDR opt_global.h
LINUX_BOOT_ABI opt_global.h
LOADERRAMADDR opt_global.h
-NO_EVENTTIMERS opt_timer.h
PHYSADDR opt_global.h
SOCDEV_PA opt_global.h
SOCDEV_VA opt_global.h
OpenPOWER on IntegriCloud