summaryrefslogtreecommitdiffstats
path: root/drivers/hsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-06-03 17:14:01 +0200
committerSebastian Reichel <sre@kernel.org>2014-06-03 23:46:28 +0200
commit518e1624f56615a88c91bc79c7b4b4d9eb2419e5 (patch)
treee3a5159a8c0bea7d2fe4144302c179e17b1c4989 /drivers/hsi
parentHSI: Introduce Nokia N900 modem driver (diff)
downloadlinux-518e1624f56615a88c91bc79c7b4b4d9eb2419e5.tar.xz
linux-518e1624f56615a88c91bc79c7b4b4d9eb2419e5.zip
HSI: fix omap ssi driver dependency
The SSI protocol implementation has an incorrect dependency on the OMAP_SSI driver, which allows SSI to be built-in while the underlying OMAP_SSI implementation is a loadable module, causing a link error. This changes the dependency to the simpler 'depends on OMAP_SSI' that also ensures that SSI-protocol can only be a module if OMAP_SSI is not built-in. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Sebastian Reichel <sre@kernel.org> Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Cc: Pavel Machek <pavel@ucw.cz> Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/hsi')
-rw-r--r--drivers/hsi/clients/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/clients/Kconfig b/drivers/hsi/clients/Kconfig
index 71b9f9ab86e4..bc60dec3f586 100644
--- a/drivers/hsi/clients/Kconfig
+++ b/drivers/hsi/clients/Kconfig
@@ -15,7 +15,7 @@ config NOKIA_MODEM
config SSI_PROTOCOL
tristate "SSI protocol"
- depends on HSI && PHONET && (OMAP_SSI=y || OMAP_SSI=m)
+ depends on HSI && PHONET && OMAP_SSI
help
If you say Y here, you will enable the SSI protocol aka McSAAB.