diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /arch/powerpc/kernel/idle.c | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
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 | */ |