Fix build errors so its buildable

Conflicts:
	drivers/net/wireless/bcmdhd/dhd_linux.c