diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /arch/powerpc/kernel/idle.c | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/idle.c')
| -rw-r--r-- | arch/powerpc/kernel/idle.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c index 4180c3998b39..8994af327b47 100644 --- a/arch/powerpc/kernel/idle.c +++ b/arch/powerpc/kernel/idle.c | |||
| @@ -39,6 +39,13 @@ | |||
| 39 | #define cpu_should_die() 0 | 39 | #define cpu_should_die() 0 |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | static int __init powersave_off(char *arg) | ||
| 43 | { | ||
| 44 | ppc_md.power_save = NULL; | ||
| 45 | return 0; | ||
| 46 | } | ||
| 47 | __setup("powersave=off", powersave_off); | ||
| 48 | |||
| 42 | /* | 49 | /* |
| 43 | * The body of the idle task. | 50 | * The body of the idle task. |
| 44 | */ | 51 | */ |