From patchwork Mon Oct 1 09:10:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jrm.kurtz@gmail.com X-Patchwork-Id: 1530191 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 3907C3FE1C for ; Mon, 1 Oct 2012 09:17:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752651Ab2JAJRA (ORCPT ); Mon, 1 Oct 2012 05:17:00 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:39155 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752429Ab2JAJQ7 (ORCPT ); Mon, 1 Oct 2012 05:16:59 -0400 Received: by wgbdr13 with SMTP id dr13so3951617wgb.1 for ; Mon, 01 Oct 2012 02:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=4NzPuwD0IWqIsXTciVhATtKiE859TrbTQ6NbjcEkMd4=; b=CGGMun2V9sSU7cgVhDY9X0SHn/tbROBBxsUybAuzPNB5G9GEFcnrx89oGgLiBD2pBo rDJtsqB6po+fPbmOw8gZnGZ5e8gof4SSHNRLtp24vQREBVHPt9C9VnxCnWB973N47eDx EcFksGYvqEGruOFseYhlN3FOZ2LN7DOQEKXkEh0oLiNA2iQ87T/Jkb9gNbGHFDZaWOWv ZNCmgplmt0wmHpcN9DhAoUuhpjpLEdo4c0AlTJuDgx2vrSY6inAkvtPlTCTmIUyr043P /8petm/Ztn5EQOAUg2vEw3BI6sgYkTQ7qhC5TX8VrYHRMBLgt1fr1PMl6vzRpe/j78UN VfUw== Received: by 10.180.80.134 with SMTP id r6mr13257267wix.1.1349083018214; Mon, 01 Oct 2012 02:16:58 -0700 (PDT) Received: from localhost.localdomain (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPS id hv8sm19699854wib.0.2012.10.01.02.16.56 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 02:16:57 -0700 (PDT) From: jrm.kurtz@gmail.com To: balbi@ti.com Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, anisse@astier.eu, Jerome Kurtz Subject: [PATCH] usb: otg: Resolving a config conflict between omap4030_usb/omap6030 and usb_musb_omap2plus Date: Mon, 1 Oct 2012 11:10:38 +0200 Message-Id: <1349082638-6380-1-git-send-email-jrm.kurtz@gmail.com> X-Mailer: git-send-email 1.7.2.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Jerome Kurtz When I try to compile with TWL6030_USB=y, TWL4030_USB=y and USB_MUSB_OMAP2PLUS=m, I get the following error: drivers/built-in.o: In function `twl4030_usb_irq': /home/xxx/kernel/linux/drivers/usb/otg/twl4030-usb.c:518: undefined reference to `omap_musb_mailbox' drivers/built-in.o: In function `twl6030_usb_irq': /home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:272: undefined reference to `omap_musb_mailbox' /home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:277: undefined reference to `omap_musb_mailbox' drivers/built-in.o: In function `twl6030_usbotg_irq': /home/xxx/kernel/linux/drivers/usb/otg/twl6030-usb.c:306: undefined reference to `omap_musb_mailbox' drivers/built-in.o: In function `twl4030_usb_phy_init': /home/xxx/kernel/linux/drivers/usb/otg/twl4030-usb.c:540: undefined reference to `omap_musb_mailbox' make: *** [vmlinux] Error 1 To solve this we must add to depends of TWL4030_USB and TWL6030_USB the option : USB_MUSB_OMAP2PLUS as done here. Signed-off-by: Jerome Kurtz --- drivers/usb/otg/Kconfig | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig index 13fd1ddf..62ea57b 100644 --- a/drivers/usb/otg/Kconfig +++ b/drivers/usb/otg/Kconfig @@ -58,7 +58,7 @@ config USB_ULPI_VIEWPORT config TWL4030_USB tristate "TWL4030 USB Transceiver Driver" - depends on TWL4030_CORE && REGULATOR_TWL4030 + depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS select USB_OTG_UTILS help Enable this to support the USB OTG transceiver on TWL4030 @@ -68,7 +68,7 @@ config TWL4030_USB config TWL6030_USB tristate "TWL6030 USB Transceiver Driver" - depends on TWL4030_CORE + depends on TWL4030_CORE && USB_MUSB_OMAP2PLUS select USB_OTG_UTILS help Enable this to support the USB OTG transceiver on TWL6030