Merge commit '69494c1' into cg_merges_20121210

ocl.c

@@ -814,8 +814,7 @@ build:
 		    strstr(name, "Antilles" ) ||
 		    strstr(name, "Wrestler" ) ||
 		    strstr(name, "Zacate" ) ||
-		    strstr(name, "WinterPark" ) ||
-		    strstr(name, "BeaverCreek" ))
+		    strstr(name, "WinterPark" ))
 			patchbfi = true;
 	} else
 		applog(LOG_DEBUG, "cl_amd_media_ops not found, will not set BITALIGN");