diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-16 09:13:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-16 09:13:34 -0800 |
| commit | 485ff09990416c75ae9593ddc71619939ab9dd51 (patch) | |
| tree | ca5a5681ba24ca74b296af07d5b4269a9564e60b /arch/powerpc/platforms/powermac/setup.c | |
| parent | 5466eb5d0ad5e9d4238da71a2a9bd216985a4849 (diff) | |
| parent | 1ae5db3742a0cfaf347231ff0bf181132c64e883 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: update defconfigs
[PATCH] powerpc: properly configure DDR/P5IOC children devs
[PATCH] powerpc: remove duplicate EXPORT_SYMBOLS
[PATCH] powerpc: RTC memory corruption
[PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption
[PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option
[PATCH] powerpc/64: enable CONFIG_BLK_DEV_SL82C105
[PATCH] powerpc: correct cacheflush loop in zImage
powerpc: Fix problem with time going backwards
powerpc: Disallow lparcfg being a module
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 1955462f408..29c2946f1c7 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")); |