mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual earth-shaking, news-breaking, rocket science pile from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits) doc: usb: Fix typo in Documentation/usb/gadget_configs.txt doc: add missing files to timers/00-INDEX timekeeping: Fix some trivial typos in comments mm: Fix some trivial typos in comments irq: Fix some trivial typos in comments NUMA: fix typos in Kconfig help text mm: update 00-INDEX doc: Documentation/DMA-attributes.txt fix typo DRM: comment: `halve' -> `half' Docs: Kconfig: `devlopers' -> `developers' doc: typo on word accounting in kprobes.c in mutliple architectures treewide: fix "usefull" typo treewide: fix "distingush" typo mm/Kconfig: Grammar s/an/a/ kexec: Typo s/the/then/ Documentation/kvm: Update cpuid documentation for steal time and pv eoi treewide: Fix common typo in "identify" __page_to_pfn: Fix typo in comment Correct some typos for word frequency clk: fixed-factor: Fix a trivial typo ...
This commit is contained in:
commit
9073e1a804
89 changed files with 109 additions and 138 deletions
|
|
@ -676,14 +676,14 @@ menu "STMicroelectronics STMPE Interface Drivers"
|
|||
depends on MFD_STMPE
|
||||
|
||||
config STMPE_I2C
|
||||
bool "STMicroelectronics STMPE I2C Inteface"
|
||||
bool "STMicroelectronics STMPE I2C Interface"
|
||||
depends on I2C=y
|
||||
default y
|
||||
help
|
||||
This is used to enable I2C interface of STMPE
|
||||
|
||||
config STMPE_SPI
|
||||
bool "STMicroelectronics STMPE SPI Inteface"
|
||||
bool "STMicroelectronics STMPE SPI Interface"
|
||||
depends on SPI_MASTER
|
||||
help
|
||||
This is used to enable SPI interface of STMPE
|
||||
|
|
|
|||
Loading…
Reference in a new issue