projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-block.git]
/
drivers
/
video
/
cirrusfb.c
diff --git
a/drivers/video/cirrusfb.c
b/drivers/video/cirrusfb.c
index 66d6f2f0a219595833f425faa80fc16676b7c0dd..1103010af54a845df91fd8859c884c504d03ef3e 100644
(file)
--- a/
drivers/video/cirrusfb.c
+++ b/
drivers/video/cirrusfb.c
@@
-60,8
+60,8
@@
#include <asm/amigahw.h>
#endif
#ifdef CONFIG_PPC_PREP
-#include <asm/
processor
.h>
-#define isPReP (
_machine == _MACH_prep
)
+#include <asm/
machdep
.h>
+#define isPReP (
machine_is(prep)
)
#else
#define isPReP 0
#endif