HSI: fix omap ssi driver dependency

HSI: fix omap ssi driver dependency

[Arnd Bergmann]

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>
---
diff --git a/drivers/hsi/clients/Kconfig b/drivers/hsi/clients/Kconfig
index 71b9f9a..bc60dec 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.
 

Re: HSI: fix omap ssi driver dependency

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 668 bytes --]

Hi Arnd,

On Tue, Jun 03, 2014 at 05:14:01PM +0200, Arnd Bergmann wrote:
> 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>

Thanks, applied:

https://git.kernel.org/cgit/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=518e1624f56615a88c91bc79c7b4b4d9eb2419e5

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]