diff --git a/[refs] b/[refs] index 5c9d29337e81..9b4c623e636c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cceedb8a87f31e341c1bf1bc6c28a13f9632aff +refs/heads/master: 10c966c310da12e1e3f68d717a8e15274fdadf29 diff --git a/trunk/drivers/usb/musb/musb_core.c b/trunk/drivers/usb/musb/musb_core.c index 0112353ec97d..4000cf6d1e81 100644 --- a/trunk/drivers/usb/musb/musb_core.c +++ b/trunk/drivers/usb/musb/musb_core.c @@ -2191,7 +2191,7 @@ static int musb_resume_early(struct platform_device *pdev) #else #define musb_suspend NULL -#define musb_resume NULL +#define musb_resume_early NULL #endif static struct platform_driver musb_driver = {