fixing meerge error for acpuclock-8960.c