git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
feature.c
diff --git
a/arch/powerpc/platforms/powermac/feature.c
b/arch/powerpc/platforms/powermac/feature.c
index
a5063cd
..
f8313bf
100644
(file)
--- a/
arch/powerpc/platforms/powermac/feature.c
+++ b/
arch/powerpc/platforms/powermac/feature.c
@@
-16,7
+16,6
@@
* - Split split split...
*
*/
* - Split split split...
*
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/delay.h>
@@
-2510,7
+2509,7
@@
found:
if (get_property(np, "flush-on-lock", NULL))
break;
powersave_nap = 1;
if (get_property(np, "flush-on-lock", NULL))
break;
powersave_nap = 1;
- printk(KERN_
INFO
"Processor NAP mode on idle enabled.\n");
+ printk(KERN_
DEBUG
"Processor NAP mode on idle enabled.\n");
break;
}
break;
}