brcmsmac: Fix merge issue