git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull kmalloc into release branch
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
feature.c
diff --git
a/arch/powerpc/platforms/powermac/feature.c
b/arch/powerpc/platforms/powermac/feature.c
index
bbe7948
..
f8313bf
100644
(file)
--- a/
arch/powerpc/platforms/powermac/feature.c
+++ b/
arch/powerpc/platforms/powermac/feature.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/pmac_feature.c
- *
* Copyright (C) 1996-2001 Paul Mackerras (paulus@cs.anu.edu.au)
* Ben. Herrenschmidt (benh@kernel.crashing.org)
*
* Copyright (C) 1996-2001 Paul Mackerras (paulus@cs.anu.edu.au)
* Ben. Herrenschmidt (benh@kernel.crashing.org)
*
@@
-18,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>
@@
-2512,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;
}
@@
-2953,7
+2950,7
@@
static void *pmac_early_vresume_data;
void pmac_set_early_video_resume(void (*proc)(void *data), void *data)
{
void pmac_set_early_video_resume(void (*proc)(void *data), void *data)
{
- if (
_machine != _MACH_Pmac
)
+ if (
!machine_is(powermac)
)
return;
preempt_disable();
pmac_early_vresume_proc = proc;
return;
preempt_disable();
pmac_early_vresume_proc = proc;