devices-msm7x27a: fix merge error
block: fix merge error
cyttsp4_i2c: fix build error