diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
| commit | 28596c9722289b2f98fa83a2e4351eb0a031b953 (patch) | |
| tree | f1a76a8a2604ac710bad28e3ad1b5976601c82d4 /drivers/platform/x86/Kconfig | |
| parent | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (diff) | |
| parent | 7bb38d57fd75f03753a5b362916c5bbde8290208 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina:
"Usual pile from trivial tree everyone is so eagerly waiting for"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Remove MN10300_PROC_MN2WS0038
mei: fix comments
treewide: Fix typos in Kconfig
kprobes: update jprobe_example.c for do_fork() change
Documentation: change "&" to "and" in Documentation/applying-patches.txt
Documentation: remove obsolete pcmcia-cs from Changes
Documentation: update links in Changes
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
score: Remove GENERIC_HAS_IOMAP
gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
tty: doc: Fix grammar in serial/tty
dma-debug: modify check_for_stack output
treewide: fix errors in printk
genirq: fix reference in devm_request_threaded_irq comment
treewide: fix synchronize_rcu() in comments
checkstack.pl: port to AArch64
doc: queue-sysfs: minor fixes
init/do_mounts: better syntax description
MIPS: fix comment spelling
powerpc/simpleboot: fix comment
...
Diffstat (limited to 'drivers/platform/x86/Kconfig')
| -rw-r--r-- | drivers/platform/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 3bbcbf12c1fb..4dcfb7116a04 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -540,7 +540,7 @@ config ASUS_NB_WMI | |||
| 540 | This is a driver for newer Asus notebooks. It adds extra features | 540 | This is a driver for newer Asus notebooks. It adds extra features |
| 541 | like wireless radio and bluetooth control, leds, hotkeys, backlight... | 541 | like wireless radio and bluetooth control, leds, hotkeys, backlight... |
| 542 | 542 | ||
| 543 | For more informations, see | 543 | For more information, see |
| 544 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> | 544 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> |
| 545 | 545 | ||
| 546 | If you have an ACPI-WMI compatible Asus Notebook, say Y or M | 546 | If you have an ACPI-WMI compatible Asus Notebook, say Y or M |
| @@ -553,7 +553,7 @@ config EEEPC_WMI | |||
| 553 | This is a driver for newer Eee PC laptops. It adds extra features | 553 | This is a driver for newer Eee PC laptops. It adds extra features |
| 554 | like wireless radio and bluetooth control, leds, hotkeys, backlight... | 554 | like wireless radio and bluetooth control, leds, hotkeys, backlight... |
| 555 | 555 | ||
| 556 | For more informations, see | 556 | For more information, see |
| 557 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> | 557 | <file:Documentation/ABI/testing/sysfs-platform-asus-wmi> |
| 558 | 558 | ||
| 559 | If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M | 559 | If you have an ACPI-WMI compatible Eee PC laptop (>= 1000), say Y or M |