diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /drivers/base/power/runtime.c | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'drivers/base/power/runtime.c')
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index adbc3148c039..4bafef83e79f 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -64,6 +64,7 @@ int dpm_runtime_suspend(struct device * dev, pm_message_t state) | |||
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | #if 0 | ||
| 67 | /** | 68 | /** |
| 68 | * dpm_set_power_state - Update power_state field. | 69 | * dpm_set_power_state - Update power_state field. |
| 69 | * @dev: Device. | 70 | * @dev: Device. |
| @@ -80,3 +81,4 @@ void dpm_set_power_state(struct device * dev, pm_message_t state) | |||
| 80 | dev->power.power_state = state; | 81 | dev->power.power_state = state; |
| 81 | up(&dpm_sem); | 82 | up(&dpm_sem); |
| 82 | } | 83 | } |
| 84 | #endif /* 0 */ | ||