diff --git a/[refs] b/[refs] index 1153f7c1c815..0bae91bd250e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73115300353c7a48022c2f6260a4a9002393a784 +refs/heads/master: e23f773ee481aac96814aa9a4dbb0a7a4e0e9a7a diff --git a/trunk/drivers/staging/keucr/usb.c b/trunk/drivers/staging/keucr/usb.c index d7dab727cd6f..260828ea8eaf 100644 --- a/trunk/drivers/staging/keucr/usb.c +++ b/trunk/drivers/staging/keucr/usb.c @@ -30,6 +30,7 @@ static struct usb_device_id eucr_usb_ids [] = { MODULE_DEVICE_TABLE (usb, eucr_usb_ids); +#ifdef CONFIG_PM int eucr_suspend(struct usb_interface *iface, pm_message_t message) { @@ -102,6 +103,14 @@ int eucr_reset_resume(struct usb_interface *iface) } //EXPORT_SYMBOL_GPL(usb_stor_reset_resume); +#else + +#define eucr_suspend NULL +#define eucr_resume NULL +#define eucr_reset_resume NULL + +#endif + //----- eucr_pre_reset() --------------------- static int eucr_pre_reset(struct usb_interface *iface) {