From patchwork Tue Apr 5 17:50:34 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 688391 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p35Hox4v014299 for ; Tue, 5 Apr 2011 17:51:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752838Ab1DERu5 (ORCPT ); Tue, 5 Apr 2011 13:50:57 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:42041 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807Ab1DERu4 (ORCPT ); Tue, 5 Apr 2011 13:50:56 -0400 Received: by eyx24 with SMTP id 24so198009eyx.19 for ; Tue, 05 Apr 2011 10:50:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :mime-version:content-type:content-transfer-encoding; bh=ZQHZcFsFURk+px3+tdFSvqNzCEExLoHW7iegw0czhkM=; b=sfL2xXsARFyQvurpgNdpiJGhr/Qv1kdTIYkY6T4m7C2lbPofRdbnZcZZ9Kx4vlxmbf hqdHt3feyftTQN7CFP8+zOqAEOvshnepKMIq74lledFT7cw1DA0ODLCDsMa8ZortLqPU V7ujDF+O7rY2TdzfFWFbtYz1PL5lHRpIHX9S0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; b=cVw3BjaiS4a8RERDF9tXPWmlnHUSzUMqzE4ePpZVohVYXXsLNiDlHuIuNo6Q26k4mD J//M/ABVvmy/HZtpdwQoESkxsxC1a6WxKpL3yyTDS/WW3h73+FnJH3hJxjPhK5erSjms SadnHnzt4ttFC2x9wSsqkzr4tkNU60KAgxEmM= Received: by 10.14.127.12 with SMTP id c12mr4470270eei.61.1302025855143; Tue, 05 Apr 2011 10:50:55 -0700 (PDT) Received: from xi (c83-249-240-82.bredband.comhem.se [83.249.240.82]) by mx.google.com with ESMTPS id y7sm4133733eeh.14.2011.04.05.10.50.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Apr 2011 10:50:54 -0700 (PDT) Received: from johan by xi with local (Exim 4.74) (envelope-from ) id 1Q7AOx-0006jI-OY; Tue, 05 Apr 2011 19:50:51 +0200 From: Johan Hovold To: Felipe Balbi Cc: Greg Kroah-Hartman , Hema HK , linux-usb@vger.kernel.org, linux-omap@vger.kernel.org, Johan Hovold Subject: [PATCH] usb: musb: omap2430: fix build failure Date: Tue, 5 Apr 2011 19:50:34 +0200 Message-Id: <1302025834-25729-1-git-send-email-jhovold@gmail.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 05 Apr 2011 17:51:00 +0000 (UTC) Fix build failure introduced by commit 7acc6197b76edd0b932a7cbcc6cfad0a8a87f026 (usb: musb: Idle path retention and offmode support for OMAP3) when building without gadget support. CC drivers/usb/musb/omap2430.o drivers/usb/musb/omap2430.c: In function ‘musb_otg_notifications’: drivers/usb/musb/omap2430.c:262: error: ‘struct musb’ has no member named ‘gadget_driver’ Signed-off-by: Johan Hovold Signed-off-by: Felipe Balbi --- drivers/usb/musb/omap2430.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 25cb8b0..57a27fa 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c @@ -259,9 +259,10 @@ static int musb_otg_notifications(struct notifier_block *nb, case USB_EVENT_VBUS: DBG(4, "VBUS Connect\n"); +#ifdef CONFIG_USB_GADGET_MUSB_HDRC if (musb->gadget_driver) pm_runtime_get_sync(musb->controller); - +#endif otg_init(musb->xceiv); break;