Merge branch 'odroidc-3.10.y' into odroidc-3.10.y

This commit is contained in:
Mauro Ribeiro
2015-01-02 05:30:40 -02:00
2 changed files with 0 additions and 7 deletions

View File

@@ -273,8 +273,6 @@ static int usb_probe_interface(struct device *dev)
intf->needs_binding = 0;
intf->auto_suspend = driver->supports_autosuspend;
if (usb_device_is_owned(udev))
return error;

View File

@@ -307,11 +307,6 @@ static const struct dev_pm_ops usb_device_pm_ops = {
.thaw = usb_dev_thaw,
.poweroff = usb_dev_poweroff,
.restore = usb_dev_restore,
#if 0 //def CONFIG_PM_RUNTIME
.runtime_suspend = usb_runtime_suspend,
.runtime_resume = usb_runtime_resume,
.runtime_idle = usb_runtime_idle,
#endif
};
#endif /* CONFIG_PM */