diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 22:36:31 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-13 22:36:31 (GMT) |
| commit | 392b46f31f43a71c5391eb9cffe304979d2d6c30 (patch) | |
| tree | 50999c8f615113ee6ec6043981312a4d65d2c59e /drivers/hsi/clients/Kconfig | |
| parent | a21c1ea65615f5323575d84508637a9481ca79c6 (diff) | |
| parent | 265ef3ee9575e6d150f485d28dbe153a50d27f4c (diff) | |
| download | linux-392b46f31f43a71c5391eb9cffe304979d2d6c30.tar.xz | |
Merge tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI changes from Sebastian Reichel:
- nokia-modem: support speech data
- misc fixes
* tag 'hsi-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
HSI: cmt_speech: fix error return code
HSI: nokia-modem: Add cmt-speech support
HSI: cmt_speech: Add cmt-speech driver
HSI: nokia-modem: fix error return code
Diffstat (limited to 'drivers/hsi/clients/Kconfig')
| -rw-r--r-- | drivers/hsi/clients/Kconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/hsi/clients/Kconfig b/drivers/hsi/clients/Kconfig index bc60dec..d612620 100644 --- a/drivers/hsi/clients/Kconfig +++ b/drivers/hsi/clients/Kconfig @@ -6,13 +6,23 @@ comment "HSI clients" config NOKIA_MODEM tristate "Nokia Modem" - depends on HSI && SSI_PROTOCOL + depends on HSI && SSI_PROTOCOL && CMT_SPEECH help Say Y here if you want to add support for the modem on Nokia N900 (Nokia RX-51) hardware. If unsure, say N. +config CMT_SPEECH + tristate "CMT speech" + depends on HSI && SSI_PROTOCOL + help + If you say Y here, you will enable the CMT speech protocol used + by Nokia modems. If you say M the protocol will be available as + module named cmt_speech. + + If unsure, say N. + config SSI_PROTOCOL tristate "SSI protocol" depends on HSI && PHONET && OMAP_SSI |