Pull acpica into release branch

[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..e0000ce 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/systemcfg.h>
+#include <asm/machdep.h>
 
 #if 0
 #define DEBUG(A...)    printk(KERN_ERR A)
@@ -482,11 +482,13 @@ static int __init rtas_init(void)
 {
        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 (systemcfg->platform & PLATFORM_PSERIES)
-                       printk(KERN_INFO "rtasd: no event-scan on system\n");
-               return 1;
+               printk(KERN_INFO "rtasd: no event-scan on system\n");
+               return -ENODEV;
        }
 
        entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);