diff --git a/[refs] b/[refs]
index 84dd5ede8b91..a6206b6d1d4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dee2c87ebbe5d7ce8c4c163966a0bd9c02c75ef
+refs/heads/master: 9f08e9db84c1e9234e07b9b595f5b2508c621823
diff --git a/trunk/arch/powerpc/include/asm/ps3.h b/trunk/arch/powerpc/include/asm/ps3.h
index b9e4987986dd..dcd302f489f6 100644
--- a/trunk/arch/powerpc/include/asm/ps3.h
+++ b/trunk/arch/powerpc/include/asm/ps3.h
@@ -421,12 +421,12 @@ static inline struct ps3_system_bus_driver *
 static inline void ps3_system_bus_set_driver_data(
 	struct ps3_system_bus_device *dev, void *data)
 {
-	dev->core.driver_data = data;
+	dev_set_drvdata(&dev->core, data);
 }
 static inline void *ps3_system_bus_get_driver_data(
 	struct ps3_system_bus_device *dev)
 {
-	return dev->core.driver_data;
+	return dev_get_drvdata(&dev->core);
 }
 
 /* These two need global scope for get_dma_ops(). */