---

yaml --- r: 336567 b: refs/heads/master c: 499b42c h: refs/heads/master i: 336565: c041010 336563: 984fd63 336559: fcfbdfa v: v3
git-mirror · Nov 29, 2012 · 1957f12 · 1957f12
1 parent 8b3dff2
commit 1957f12
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);