From patchwork Mon Jan  4 11:09:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Maulik Mankad <x0082077@ti.com>
X-Patchwork-Id: 70619
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04BAfaa026379
	for <patchwork-omap@patchwork.kernel.org>;
	Mon, 4 Jan 2010 11:10:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753365Ab0ADLK1 (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 4 Jan 2010 06:10:27 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753320Ab0ADLK0
	(ORCPT <rfc822; linux-omap-outgoing>);
	Mon, 4 Jan 2010 06:10:26 -0500
Received: from devils.ext.ti.com ([198.47.26.153]:36724 "EHLO
	devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753235Ab0ADLK0 (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Mon, 4 Jan 2010 06:10:26 -0500
Received: from dbdp31.itg.ti.com ([172.24.170.98])
	by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id o04BA298024639
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Mon, 4 Jan 2010 05:10:04 -0600
Received: from linfarm476.india.ti.com (localhost [127.0.0.1])
	by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o04BA0uh027137;
	Mon, 4 Jan 2010 16:40:00 +0530 (IST)
Received: from linfarm476.india.ti.com (localhost [127.0.0.1])
	by linfarm476.india.ti.com (8.12.11/8.12.11) with ESMTP id
	o04BA0bf013067; Mon, 4 Jan 2010 16:40:00 +0530
Received: (from x0082077@localhost)
	by linfarm476.india.ti.com (8.12.11/8.12.11/Submit) id o04B9xxQ013065;
	Mon, 4 Jan 2010 16:39:59 +0530
From: Maulik Mankad <x0082077@ti.com>
To: linux-omap@vger.kernel.org
Cc: linux-usb@vger.kernel.org, Maulik Mankad <x0082077@ti.com>,
	Tony Lindgren <tony@atomide.com>, Felipe Balbi <felipe.balbi@nokia.com>,
	Greg Kroah-Hartman <gregkh@suse.de>, Olof Johansson <olof@lixom.net>,
	Sergei Shtylyov <sshtylyov@ru.mvista.com>,
	"Gupta, Ajay Kumar" <ajay.gupta@ti.com>
Subject: [PATCH v2 1/2] ARM : OMAP : Add empty functions in header file
Date: Mon,  4 Jan 2010 16:39:59 +0530
Message-Id: <1262603399-13036-1-git-send-email-x0082077@ti.com>
X-Mailer: git-send-email 1.5.5
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org


Index: felipe_musb/include/linux/usb/otg.h
===================================================================
--- felipe_musb.orig/include/linux/usb/otg.h
+++ felipe_musb/include/linux/usb/otg.h
@@ -110,9 +110,19 @@ struct otg_transceiver {
 /* for board-specific init logic */
 extern int otg_set_transceiver(struct otg_transceiver *);
 
+#if defined(CONFIG_USB_NOP_XCEIV)
 /* sometimes transceivers are accessed only through e.g. ULPI */
 extern void usb_nop_xceiv_register(void);
 extern void usb_nop_xceiv_unregister(void);
+#else
+extern inline void usb_nop_xceiv_register()
+{
+}
+
+extern inline void usb_nop_xceiv_unregister()
+{
+}
+#endif
 
 /* helpers for direct access thru low-level io interface */
 static inline int otg_io_read(struct otg_transceiver *otg, u32 reg)