From 76c610b9257eda81b5eda46ea3e7c00a6db1b7d6 Mon Sep 17 00:00:00 2001 From: Andy Green Date: Wed, 19 Nov 2008 17:11:12 +0000 Subject: 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 --- drivers/base/power/main.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'drivers/base/power') 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. -- cgit v1.2.3