diff --git a/[refs] b/[refs]
index 12f39775ebf9..1c3b5425db77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d50701781a55d09696a0585112a124b0723acf3b
+refs/heads/master: ee418b8646d5d6dc2df343ffaefd2b74940d0048
diff --git a/trunk/arch/powerpc/include/asm/spu.h b/trunk/arch/powerpc/include/asm/spu.h
index 8b2eb044270a..0ab8d869e3d6 100644
--- a/trunk/arch/powerpc/include/asm/spu.h
+++ b/trunk/arch/powerpc/include/asm/spu.h
@@ -128,7 +128,7 @@ struct spu {
 	int number;
 	unsigned int irqs[3];
 	u32 node;
-	u64 flags;
+	unsigned long flags;
 	u64 class_0_pending;
 	u64 class_0_dar;
 	u64 class_1_dar;