M2: Fix some compilation warnings

This reverts commit cd0dd4fb57c37da6407f561d52b28a916400c6f6.
M2: Fix some compilation warnings (at&t defconfig)