diff options
| author | Kumar Gala | 2006-03-20 17:53:56 +0100 |
|---|---|---|
| committer | Kumar Gala | 2006-03-20 17:53:56 +0100 |
| commit | 61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch) | |
| tree | 2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/powerpc/platforms/powermac/setup.c | |
| parent | Merge branch 'master' of git+ssh://galak@master.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | [PATCH] powerpc: Fix bug in bug fix for bug in lmb_alloc() (diff) | |
| download | kernel-qcow2-linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.gz kernel-qcow2-linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.xz kernel-qcow2-linux-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/platforms/powermac/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 97c54e19c1b5..385aab90c4d2 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -621,10 +621,6 @@ static void __init pmac_init_early(void) /* Probe motherboard chipset */ pmac_feature_init(); - /* We can NAP */ - powersave_nap = 1; - printk(KERN_INFO "Using native/NAP idle loop\n"); - /* Initialize debug stuff */ udbg_scc_init(!!strstr(cmd_line, "sccdbg")); udbg_adb_init(!!strstr(cmd_line, "btextdbg")); |