[PATCH] bcm43xx: fix-up build breakage from merging patches out of order