From patchwork Thu May 8 13:52:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4136251 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4DF17BFF02 for ; Thu, 8 May 2014 13:52:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80BC220253 for ; Thu, 8 May 2014 13:52:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 963BF201D5 for ; Thu, 8 May 2014 13:52:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753127AbaEHNwn (ORCPT ); Thu, 8 May 2014 09:52:43 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:49995 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752535AbaEHNwk (ORCPT ); Thu, 8 May 2014 09:52:40 -0400 Received: from wuerfel.lan (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue101) with ESMTP (Nemesis) id 0LoYQs-1XJ7U13Mp0-00gYQ1; Thu, 08 May 2014 15:52:36 +0200 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Felipe Balbi , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-omap@vger.kernel.org Subject: [PATCH 4/8] usb: phy: fix isp1301-omap dependency on tps65010 Date: Thu, 8 May 2014 15:52:17 +0200 Message-Id: <1399557141-1346645-5-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399557141-1346645-1-git-send-email-arnd@arndb.de> References: <1399557141-1346645-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:eE248eORvrPMfTgZA5kA0oV9xEGAuH3QXd81j3GpsXJ TQd1cC3go6R8ZyYQD74PHCfNzgCtoXAxV/S3/Z/vAgeKAPnPDk UsMf/Ok3IFblw3wB7f7zP7FnXjH7E6D9mMyFRU2QqWG2+/eQdP mL5MBxqkX2eEMaIPOnKihH0oZgpClhQBzwXH7wkaZtZdJLGU7v j6W54xmXOZnrQD3qhNOfj74/Of1GXHe4dPgJMNHTWK73T+rzFm c8Ix/WwNdYQhZmgYabcdCkJJ0dSIzegwDUltryVWIRbLGdc0P4 2lNlz/zC2tv0FuxFKxtH3gZdlxuJ5iZ2H1VtUeIFE+MfsbLEAx AdKFwgatt2mumij4AfBvz4i7Z19zSOatlEBPp5ws9 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 isp1301-omap driver cannot be built-in if the tps65010 driver is a module, otherwise we get a link error from the reference to the tps65010_set_vbus_draw function. There is already a hack in the driver to work around the problem of tps65010 being not available at all. This patch extends that hack to ensure that the real tps65010_set_vbus_draw() function is only called when it's avaiable. Signed-off-by: Arnd Bergmann Cc: linux-omap@vger.kernel.org --- drivers/usb/phy/phy-isp1301-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c index 6e146d7..35a0dd2 100644 --- a/drivers/usb/phy/phy-isp1301-omap.c +++ b/drivers/usb/phy/phy-isp1301-omap.c @@ -94,7 +94,7 @@ struct isp1301 { #if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) -#if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) +#if defined(CONFIG_TPS65010) || (defined(CONFIG_TPS65010_MODULE) && defined(MODULE)) #include