sunxi: Cleanup harmless SPL merge conflict