diff --git a/[refs] b/[refs]
index b8d66f2c0d3b..34b2199874db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6add7cd618b4d4dc525731beb539c5e06e891855
+refs/heads/master: 481e20799bdcf98fd5a1d829d187239a90b15395
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index 9cd3b5cfcc42..81b78ede37c4 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -1320,7 +1320,10 @@ struct root_device
 	struct module *owner;
 };
 
-#define to_root_device(dev) container_of(dev, struct root_device, dev)
+inline struct root_device *to_root_device(struct device *d)
+{
+	return container_of(d, struct root_device, dev);
+}
 
 static void root_device_release(struct device *dev)
 {