projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
core
/
sysfs.c
diff --git
a/drivers/usb/core/sysfs.c
b/drivers/usb/core/sysfs.c
index 3f81a3dc6867638a17ab4b0e2850aa1d79ec33c3..aa38db44818a99ab9331c11d2c670669d014498f 100644
(file)
--- a/
drivers/usb/core/sysfs.c
+++ b/
drivers/usb/core/sysfs.c
@@
-338,7
+338,7
@@
static void remove_persist_attributes(struct device *dev)
#endif /* CONFIG_PM */
#endif /* CONFIG_PM */
-#ifdef CONFIG_
USB_SUSPEND
+#ifdef CONFIG_
PM_RUNTIME
static ssize_t
show_connected_duration(struct device *dev, struct device_attribute *attr,
static ssize_t
show_connected_duration(struct device *dev, struct device_attribute *attr,
@@
-544,7
+544,7
@@
static void remove_power_attributes(struct device *dev)
#define add_power_attributes(dev) 0
#define remove_power_attributes(dev) do {} while (0)
#define add_power_attributes(dev) 0
#define remove_power_attributes(dev) do {} while (0)
-#endif /* CONFIG_
USB_SUSPEND
*/
+#endif /* CONFIG_
PM_RUNTIME
*/
/* Descriptor fields */
/* Descriptor fields */