summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:10:54 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:10:54 +1100
commit846e6e13b056c74f1ed5838f3c55e722989b637d (patch)
treee66b956638267239ba104ee258f12ddb4af637f1 /init
parent3867ac7e86a24791a7afe30d31d53fe2c76723c2 (diff)
parent17fa87fe5a5141d3c082c5c91e950aca9e0ec701 (diff)
Merge remote-tracking branch 'char-misc/char-misc-next'
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 53fe1c52d608..ecd2ea5207a5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1712,6 +1712,13 @@ config PERF_USE_VMALLOC
help
See tools/perf/design.txt for details
+config PC104
+ bool "PC/104 support"
+ help
+ Expose PC/104 form factor device drivers and options available for
+ selection and configuration. Enable this option if your target
+ machine has a PC/104 bus.
+
menu "Kernel Performance Events And Counters"
config PERF_EVENTS