Merge commit '683b6c6f82a60fabf47012581c2cfbf1b037ab95' into stable/for-linus-3.15

This merge of the irq-core-for-linus branch broke the ARM build when
Xen is enabled.

Conflicts:
	drivers/xen/events/events_base.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 64ea21971be2..5cbf78d0be25 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -1040,7 +1040,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                  */
                 if (type == HUB_INIT) {
                         delay = hub_power_on(hub, false);
-                        PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
+                        INIT_DELAYED_WORK(&hub->init_work, hub_init_func2);
                         schedule_delayed_work(&hub->init_work,
                                         msecs_to_jiffies(delay));
 
@@ -1194,7 +1194,7 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 
                 /* Don't do a long sleep inside a workqueue routine */
                 if (type == HUB_INIT2) {
-                        PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func3);
+                        INIT_DELAYED_WORK(&hub->init_work, hub_init_func3);
                         schedule_delayed_work(&hub->init_work,
                                         msecs_to_jiffies(delay));
                         return;         /* Continues at init3: below */