Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / cbe_thermal.c

diff --git a/arch/powerpc/platforms/cell/cbe_thermal.c b/arch/powerpc/platforms/cell/cbe_thermal.c
index 17831a92d91e15de08c6021c3f13ddb769d6084e..70e0d968d30f9e5edd77efdc7ce01451586440e3 100644 (file)
--- a/arch/powerpc/platforms/cell/cbe_thermal.c
+++ b/arch/powerpc/platforms/cell/cbe_thermal.c
@@ -29,6 +29,7 @@
 #include <asm/prom.h>
 
 #include "cbe_regs.h"
+#include "spu_priv1_mmio.h"
 
 static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
 {
@@ -36,7 +37,7 @@ static struct cbe_pmd_regs __iomem *get_pmd_regs(struct sys_device *sysdev)
 
        spu = container_of(sysdev, struct spu, sysdev);
 
-       return cbe_get_pmd_regs(spu->devnode);
+       return cbe_get_pmd_regs(spu_devnode(spu));
 }
 
 /* returns the value for a given spu in a given register */
@@ -49,7 +50,7 @@ static u8 spu_read_register_value(struct sys_device *sysdev, union spe_reg __iom
        /* getting the id from the reg attribute will not work on future device-tree layouts
         * in future we should store the id to the spu struct and use it here */
        spu = container_of(sysdev, struct spu, sysdev);
-       id = (unsigned int *)get_property(spu->devnode, "reg", NULL);
+       id = (unsigned int *)get_property(spu_devnode(spu), "reg", NULL);
        value.val = in_be64(&reg->val);
 
        return value.spe[*id];
@@ -114,6 +115,7 @@ static struct sysdev_attribute attr_spu_temperature = {
 
 static struct attribute *spu_attributes[] = {
        &attr_spu_temperature.attr,
+       NULL,
 };
 
 static struct attribute_group spu_attribute_group = {
@@ -134,6 +136,7 @@ static struct sysdev_attribute attr_ppe_temperature1 = {
 static struct attribute *ppe_attributes[] = {
        &attr_ppe_temperature0.attr,
        &attr_ppe_temperature1.attr,
+       NULL,
 };
 
 static struct attribute_group ppe_attribute_group = {