sync the x86-2.6 config with the brcm-2.6 one