Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / arch / powerpc / platforms / cell / ras.c

diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index b5ebc916388bb27c80813d393bfb7e06654d214f..e43024c0392e2802ced8f5a5af9c8695f25891d8 100644 (file)
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -1,4 +1,13 @@
-#define DEBUG
+/*
+ * Copyright 2006-2008, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#undef DEBUG
 
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -10,9 +19,9 @@
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/rtas.h>
+#include <asm/cell-regs.h>
 
 #include "ras.h"
-#include "cbe_regs.h"
 
 
 static void dump_fir(int cpu)
@@ -149,7 +158,7 @@ static int __init cbe_ptcal_enable(void)
        if (!np)
                return -ENODEV;
 
-       size = get_property(np, "ibm,cbe-ptcal-size", NULL);
+       size = of_get_property(np, "ibm,cbe-ptcal-size", NULL);
        if (!size)
                return -ENODEV;
 
@@ -168,7 +177,7 @@ static int __init cbe_ptcal_enable(void)
 
        /* support for older device tree - use cpu nodes */
        for_each_node_by_type(np, "cpu") {
-               const u32 *nid = get_property(np, "node-id", NULL);
+               const u32 *nid = of_get_property(np, "node-id", NULL);
                if (!nid) {
                        printk(KERN_ERR "%s: node %s is missing node-id?\n",
                                        __FUNCTION__, np->full_name);