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
e26b042
..
fcc4d56
100644
(file)
--- a/
arch/powerpc/platforms/pseries/rtasd.c
+++ b/
arch/powerpc/platforms/pseries/rtasd.c
@@
-27,7
+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/
systemcfg
.h>
+#include <asm/
machdep
.h>
#if 0
#define DEBUG(A...) printk(KERN_ERR A)
#if 0
#define DEBUG(A...) printk(KERN_ERR A)
@@
-482,10
+482,12
@@
static int __init rtas_init(void)
{
struct proc_dir_entry *entry;
{
struct proc_dir_entry *entry;
- /* No RTAS, only warn if we are on a pSeries box */
+ if (!machine_is(pseries))
+ return 0;
+
+ /* No RTAS */
if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
- if (systemcfg->platform & PLATFORM_PSERIES)
- printk(KERN_INFO "rtasd: no event-scan on system\n");
+ printk(KERN_INFO "rtasd: no event-scan on system\n");
return 1;
}
return 1;
}