From 6af047b477b88e84f61be12f649e8aee9d82abf1 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 9 Dec 2010 22:46:29 +0100 Subject: [PATCH] --- yaml --- r: 226963 b: refs/heads/master c: 352a337832774a6929c16b569abe9cedc3db01cc h: refs/heads/master i: 226961: 808b1b7224040a2af4c8280be582cbb5957a91ca 226959: 16de3f8d31ae02de47c756699a17698b932e37f0 v: v3 --- [refs] | 2 +- trunk/include/linux/usb/otg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0db2877a744c..1c336e96b442 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 +refs/heads/master: 352a337832774a6929c16b569abe9cedc3db01cc diff --git a/trunk/include/linux/usb/otg.h b/trunk/include/linux/usb/otg.h index 0a5b3711e502..a1a1e7a73ec9 100644 --- a/trunk/include/linux/usb/otg.h +++ b/trunk/include/linux/usb/otg.h @@ -116,7 +116,7 @@ struct otg_transceiver { /* for board-specific init logic */ extern int otg_set_transceiver(struct otg_transceiver *); -#if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE) +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) /* sometimes transceivers are accessed only through e.g. ULPI */ extern void usb_nop_xceiv_register(void); extern void usb_nop_xceiv_unregister(void);