diff --git a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
index aeb7d83a4d13..0e23630749e1 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-wm8326.c
@@ -172,18 +172,8 @@ int wm831x_post_init(struct wm831x *Wm831x)
 	udelay(100);
 
 	dcdc = regulator_get(NULL, "vdd_core");	// vdd_log
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
 	regulator_set_voltage(dcdc, 1150000, 1150000);
-	regulator_set_suspend_voltage(dcdc, 1100000);
-=======
-	regulator_set_voltage(dcdc, 1100000, 1100000);
 	regulator_set_suspend_voltage(dcdc, 1000000);
->>>>>>> Stashed changes
-=======
-	regulator_set_voltage(dcdc, 1100000, 1100000);
-	regulator_set_suspend_voltage(dcdc, 1000000);
->>>>>>> Stashed changes
 	regulator_enable(dcdc);
 	printk("%s set dcdc1 vdd_core(vdd_log)=%dmV end\n", __func__, regulator_get_voltage(dcdc));
 	regulator_put(dcdc);