aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds2017-02-22 13:38:22 -0600
committerLinus Torvalds2017-02-22 13:38:22 -0600
commite30aee9e10bb5168579e047f05c3d13d09e23356 (patch)
tree12371bdcd52d2427cad838201997479e31b6a9c9 /init
parent8ff546b801e5cca0337c0f0a7234795d0a6309a1 (diff)
parent6cf18e6927c0b224f972e3042fb85770d63cb9f8 (diff)
downloadkernel-e30aee9e10bb5168579e047f05c3d13d09e23356.tar.gz
kernel-e30aee9e10bb5168579e047f05c3d13d09e23356.tar.xz
kernel-e30aee9e10bb5168579e047f05c3d13d09e23356.zip
Merge tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the big char/misc driver patchset for 4.11-rc1. Lots of different driver subsystems updated here: rework for the hyperv subsystem to handle new platforms better, mei and w1 and extcon driver updates, as well as a number of other "minor" driver updates. All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (169 commits) goldfish: Sanitize the broken interrupt handler x86/platform/goldfish: Prevent unconditional loading vmbus: replace modulus operation with subtraction vmbus: constify parameters where possible vmbus: expose hv_begin/end_read vmbus: remove conditional locking of vmbus_write vmbus: add direct isr callback mode vmbus: change to per channel tasklet vmbus: put related per-cpu variable together vmbus: callback is in softirq not workqueue binder: Add support for file-descriptor arrays binder: Add support for scatter-gather binder: Add extra size to allocator binder: Refactor binder_transact() binder: Support multiple /dev instances binder: Deal with contexts in debugfs binder: Support multiple context managers binder: Split flat_binder_object auxdisplay: ht16k33: remove private workqueue auxdisplay: ht16k33: rework input device initialization ...
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 2655abb8f310..55bb6fbc294e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1706,6 +1706,13 @@ config PERF_USE_VMALLOC
1706 help 1706 help
1707 See tools/perf/design.txt for details 1707 See tools/perf/design.txt for details
1708 1708
1709config PC104
1710 bool "PC/104 support"
1711 help
1712 Expose PC/104 form factor device drivers and options available for
1713 selection and configuration. Enable this option if your target
1714 machine has a PC/104 bus.
1715
1709menu "Kernel Performance Events And Counters" 1716menu "Kernel Performance Events And Counters"
1710 1717
1711config PERF_EVENTS 1718config PERF_EVENTS