diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6def41fee76b..2162439e23a2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-18  Richard Guenther  <rguenther@suse.de>
+
+	* tree-ssa.c (useless_type_conversion_p): Remove special-casing
+	of conversions to void *.
+
 2012-01-17  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 	    Richard Sandiford  <rdsandiford@googlemail.com>
 
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index c28167e41aa7..fb2c005e8b70 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1199,10 +1199,6 @@ useless_type_conversion_p (tree outer_type, tree inner_type)
       if (TYPE_ADDR_SPACE (TREE_TYPE (outer_type))
 	  != TYPE_ADDR_SPACE (TREE_TYPE (inner_type)))
 	return false;
-
-      /* If the outer type is (void *), the conversion is not necessary.  */
-      if (VOID_TYPE_P (TREE_TYPE (outer_type)))
-	return true;
     }
 
   /* From now on qualifiers on value types do not matter.  */