lkml.org 
[lkml]   [2009]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] power: fix a build breakage on latest -tip
A recent conflict resolve (c2eefa20c3ab45ab2108ce7e6561364ea92d7334)
did put twice the function suspend_test() on kernel/power/main.c

The version added for CONFIG_PM_TEST_SUSPEND to solve the conflict overlaps
the one changed recently on (091d71e023557136e96f0e54f301497a3fc95dc3)
since PM_TEST_SUSPEND depends on SUSPEND.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 2ade836..2265b98 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -135,16 +135,6 @@ static int suspend_test(int level)

#ifdef CONFIG_PM_TEST_SUSPEND

-static int suspend_test(int level)
-{
- if (pm_test_level == level) {
- printk(KERN_INFO "suspend debug: Waiting for 5 seconds.\n");
- mdelay(5000);
- return 1;
- }
- return 0;
-}
-
/*
* We test the system suspend code by setting an RTC wakealarm a short
* time in the future, then suspending. Suspending the devices won't


\
 
 \ /
  Last update: 2009-02-09 01:01    [W:0.850 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site