Merge "msm: Kconfig: sync the 8226 and 8610 config options"