diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:11:12 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:11:12 +0000 |
| commit | 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 (patch) | |
| tree | bcd8a465296d90b88f188cea2c6ca6cde01b7480 /drivers/base | |
| parent | c520396b96bc826ff0f2df8aeead5b76df316e0c (diff) | |
fix-rebase-dust.patch
Last rebase to stable-2.6.26 left some trash from rebasing the patches on top of this,
clean it back out
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 067594c0381..954d21dcfc4 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -529,14 +529,6 @@ static pm_message_t resume_event(pm_message_t sleep_state) return PMSG_ON; } -static void -suspend_device_dbg(struct device *dev, pm_message_t state, char *info) -{ - dev_err(dev, "%s%s%s\n", info, suspend_verb(state.event), - ((state.event == PM_EVENT_SUSPEND) && device_may_wakeup(dev)) ? - ", may wakeup" : ""); -} - /** * suspend_device_noirq - Shut down one device (late suspend). * @dev: Device. |