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
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
rtasd.c
diff --git
a/arch/powerpc/platforms/pseries/rtasd.c
b/arch/powerpc/platforms/pseries/rtasd.c
index
a6f628d
..
fcc4d56
100644
(file)
--- a/
arch/powerpc/platforms/pseries/rtasd.c
+++ b/
arch/powerpc/platforms/pseries/rtasd.c
@@
-27,6
+27,7
@@
#include <asm/prom.h>
#include <asm/nvram.h>
#include <asm/atomic.h>
#include <asm/prom.h>
#include <asm/nvram.h>
#include <asm/atomic.h>
+#include <asm/machdep.h>
#if 0
#define DEBUG(A...) printk(KERN_ERR A)
#if 0
#define DEBUG(A...) printk(KERN_ERR A)
@@
-481,7
+482,7
@@
static int __init rtas_init(void)
{
struct proc_dir_entry *entry;
{
struct proc_dir_entry *entry;
- if (!
platform_is_pseries(
))
+ if (!
machine_is(pseries
))
return 0;
/* No RTAS */
return 0;
/* No RTAS */