Revert "Linaro 4.9.2: fix compile errors"

This reverts commit a1625a075417adfd29e1416b3f62bc9240c44e43.
update defconfig