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
linux 2.6.16.38 w/ vs2.0.3-rc1
[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
..
bbe7948
100644
(file)
--- a/
arch/powerpc/platforms/powermac/feature.c
+++ b/
arch/powerpc/platforms/powermac/feature.c
@@
-1,4
+1,6
@@
/*
/*
+ * 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)
*
@@
-2951,7
+2953,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_is(powermac)
)
+ if (
_machine != _MACH_Pmac
)
return;
preempt_disable();
pmac_early_vresume_proc = proc;
return;
preempt_disable();
pmac_early_vresume_proc = proc;