msm: rpm_resources: Use cpu_is_msm8x60()

Use cpu_is_msm8x60() api instead of machine_is_msm8x60_XXX()

Signed-off-by: Praveen Chidambaram <pchidamb@codeaurora.org>
diff --git a/arch/arm/mach-msm/rpm_resources.c b/arch/arm/mach-msm/rpm_resources.c
index 49a2574..ad58d0d 100644
--- a/arch/arm/mach-msm/rpm_resources.c
+++ b/arch/arm/mach-msm/rpm_resources.c
@@ -24,6 +24,7 @@
 #include <mach/msm_iomap.h>
 #include <asm/mach-types.h>
 #include <linux/io.h>
+#include <mach/socinfo.h>
 #include "mpm.h"
 #include "rpm_resources.h"
 #include "spm.h"
@@ -931,10 +932,7 @@
 
 	BUG_ON(!msm_rpmrs_levels);
 
-	if (machine_is_msm8x60_surf() || machine_is_msm8x60_ffa() ||
-		machine_is_msm8x60_fluid() || machine_is_msm8x60_fusion() ||
-		machine_is_msm8x60_fusn_ffa()) {
-
+	if (cpu_is_msm8x60()) {
 		req.id = MSM_RPMRS_ID_APPS_L2_CACHE_CTL;
 		req.value = 1;