Fix caf

Conflicts:
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c