bcmdhd: fixing merge errors