summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 13:55:35 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 13:55:35 +1100
commitcb551a11f22b8551da71752237078e5a3d4ba9d6 (patch)
treeadd425c43bd59a698724cbded24d0df884754a03 /init
parent54d31691a051a57828074d1447012eabe6d14e5a (diff)
parent6cf18e6927c0b224f972e3042fb85770d63cb9f8 (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 8b20fa3f872e..483ad679aa37 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1708,6 +1708,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