diff --git a/[refs] b/[refs]
index f40687bad7a1..c539310340a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8fbdc42c5c5df8ab1f358fe90e3a8a1bdc9ae48
+refs/heads/master: 499b42c3e4ca08f0de27683f31d3b8d5afd2a720
diff --git a/trunk/arch/powerpc/sysdev/scom.c b/trunk/arch/powerpc/sysdev/scom.c
index 702256a1ca11..9193e12df695 100644
--- a/trunk/arch/powerpc/sysdev/scom.c
+++ b/trunk/arch/powerpc/sysdev/scom.c
@@ -157,7 +157,7 @@ static int scom_debug_init_one(struct dentry *root, struct device_node *dn,
 	ent->map = SCOM_MAP_INVALID;
 	spin_lock_init(&ent->lock);
 	snprintf(ent->name, 8, "scom%d", i);
-	ent->blob.data = dn->full_name;
+	ent->blob.data = (void*) dn->full_name;
 	ent->blob.size = strlen(dn->full_name);
 
 	dir = debugfs_create_dir(ent->name, root);