Merge "mfd: 8821: Fix compilation issue on msm-3.0" into msm-3.0