bcmdhd: fix merge