summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files3
-rw-r--r--sys/conf/options4
-rw-r--r--sys/conf/options.arm4
3 files changed, 8 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 0c63533..59351b2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1629,6 +1629,7 @@ dev/etherswitch/ip17x/ip17x_phy.c optional ip17x
dev/etherswitch/ip17x/ip17x_vlans.c optional ip17x
dev/etherswitch/miiproxy.c optional miiproxy
dev/etherswitch/rtl8366/rtl8366rb.c optional rtl8366rb
+dev/etherswitch/e6000sw/e6000sw.c optional e6000sw
dev/etherswitch/ukswitch/ukswitch.c optional ukswitch
dev/evdev/cdev.c optional evdev
dev/evdev/evdev.c optional evdev
@@ -1746,10 +1747,12 @@ dev/iicbus/iiconf.c optional iicbus
dev/iicbus/iicsmb.c optional iicsmb \
dependency "iicbus_if.h"
dev/iicbus/iicoc.c optional iicoc
+dev/iicbus/is31fl319x.c optional is31fl319x gpio
dev/iicbus/isl12xx.c optional isl12xx
dev/iicbus/lm75.c optional lm75
dev/iicbus/nxprtc.c optional nxprtc | pcf8563
dev/iicbus/ofw_iicbus.c optional fdt iicbus
+dev/iicbus/pca9552.c optional pca9552 gpio
dev/iicbus/s35390a.c optional s35390a
dev/iir/iir.c optional iir
dev/iir/iir_ctrl.c optional iir
diff --git a/sys/conf/options b/sys/conf/options
index 4cab8a5..5a07508 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -878,6 +878,10 @@ MWL_DIAGAPI opt_mwl.h
MWL_AGGR_SIZE opt_mwl.h
MWL_TX_NODROP opt_mwl.h
+# Options for the Marvell NETA driver
+MVNETA_MULTIQUEUE opt_mvneta.h
+MVNETA_KTR opt_mvneta.h
+
# Options for the Intel 802.11ac wireless driver
IWM_DEBUG opt_iwm.h
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 866c12f..23c1acc 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -3,6 +3,7 @@ ARMV6 opt_global.h
ARM_CACHE_LOCK_ENABLE opt_global.h
ARM_KERN_DIRECTMAP opt_vm.h
ARM_L2_PIPT opt_global.h
+ARM_L2_PREFETCH opt_global.h
ARM_MANY_BOARD opt_global.h
NKPT2PG opt_pmap.h
ARM_WANT_TP_ADDRESS opt_global.h
@@ -57,10 +58,7 @@ SOC_IMX6 opt_global.h
SOC_MV_ARMADAXP opt_global.h
SOC_MV_ARMADA38X opt_global.h
SOC_MV_DISCOVERY opt_global.h
-SOC_MV_DOVE opt_global.h
-SOC_MV_FREY opt_global.h
SOC_MV_KIRKWOOD opt_global.h
-SOC_MV_LOKIPLUS opt_global.h
SOC_MV_ORION opt_global.h
SOC_OMAP3 opt_global.h
SOC_OMAP4 opt_global.h
OpenPOWER on IntegriCloud