From patchwork Tue Jun 3 15:14:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4289211 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9BB749F333 for ; Tue, 3 Jun 2014 15:14:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D75E720272 for ; Tue, 3 Jun 2014 15:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7E612026C for ; Tue, 3 Jun 2014 15:14:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932530AbaFCPON (ORCPT ); Tue, 3 Jun 2014 11:14:13 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:60202 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932080AbaFCPOL (ORCPT ); Tue, 3 Jun 2014 11:14:11 -0400 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue003) with ESMTP (Nemesis) id 0Liq3V-1WEwMB18EH-00d2XT; Tue, 03 Jun 2014 17:14:02 +0200 From: Arnd Bergmann To: Sebastian Reichel Cc: Pavel Machek , Ivaylo Dimitrov , linux-kernel@lists.codethink.co.uk, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: HSI: fix omap ssi driver dependency Date: Tue, 03 Jun 2014 17:14:01 +0200 Message-ID: <5261510.XDu5DxNnFl@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V02:K0:ElVCeHxfHSV48PYgRv6zF8zveCGHLuO03S2NG4K7Aof dpoM25buyi+pf8CCjLCUimin9I8R/esZOwyhKcXbWoRm6Atxwm 8YxnS7TsvjVFUYyiLU3OroBMwCogbjSLgjxWMyBgguAQw+TOrz FCuHpq7SDEwzIyQcXX/82wOCX1qTpgkbYg+Ll+h7a0mCmlI27Z XL/kRPhNjJNAg1drOZaeu7ykikqFOvfhsa5q3aajjHfAAoyfkB pkNYghSpBaPFKH24sdPku109kF7IbMmhy5fWnUXDpCCZozOubI qFd5KtrqJPVe7oB779hHF9LizHB6i3+MCy1f1Ue91tyDHowbaR RNLqo7/yF3rU7XwZEc94= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Sebastian Reichel Cc: Ivaylo Dimitrov Cc: Pavel Machek --- -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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.