projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream'
[powerpc.git]
/
drivers
/
base
/
power
/
runtime.c
diff --git
a/drivers/base/power/runtime.c
b/drivers/base/power/runtime.c
index
adbc314
..
96370ec
100644
(file)
--- a/
drivers/base/power/runtime.c
+++ b/
drivers/base/power/runtime.c
@@
-62,8
+62,10
@@
int dpm_runtime_suspend(struct device * dev, pm_message_t state)
up(&dpm_sem);
return error;
}
up(&dpm_sem);
return error;
}
+EXPORT_SYMBOL(dpm_runtime_suspend);
+#if 0
/**
* dpm_set_power_state - Update power_state field.
* @dev: Device.
/**
* dpm_set_power_state - Update power_state field.
* @dev: Device.
@@
-80,3
+82,4
@@
void dpm_set_power_state(struct device * dev, pm_message_t state)
dev->power.power_state = state;
up(&dpm_sem);
}
dev->power.power_state = state;
up(&dpm_sem);
}
+#endif /* 0 */