[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140529190129.6d3272fd@canb.auug.org.au>
Date: Thu, 29 May 2014 19:01:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Dan Williams <dan.j.williams@...el.com>
Subject: linux-next: build failure after merge of the usb tree
Hi Greg,
After merging the usb tree, today's linux-next build (sparc64 defconfig)
failed like this:
drivers/usb/core/hub.c: In function 'port_event':
drivers/usb/core/hub.c:4853:2: error: implicit declaration of function 'hub_handle_remote_wakeup' [-Werror=implicit-function-declaration]
Caused by commits af376a461cf0 ("usb: refactor port handling in
hub_events()") and 7e73be227b15 ("usb: hub_handle_remote_wakeup()
depends on CONFIG_PM_RUNTIME=y") This build has CONFIG_PM not set ...
I have added this fix patch for today (there is probably a better way):
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Thu, 29 May 2014 18:55:06 +1000
Subject: [PATCH] usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/usb/core/hub.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 5672752bfd2c..879b66e13370 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -3977,6 +3977,12 @@ EXPORT_SYMBOL_GPL(usb_disable_ltm);
void usb_enable_ltm(struct usb_device *udev) { }
EXPORT_SYMBOL_GPL(usb_enable_ltm);
+static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
+ u16 portstatus, u16 portchange)
+{
+ return 0;
+}
+
#endif /* CONFIG_PM */
--
2.0.0
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)
Powered by blists - more mailing lists