add brcm47xx-2.6 fixes from #1496