bnx2-cnic: Driver Rebranding Changes

This patch provides additional changes as a part of BNX2 and CNIC driver
re-branding effort.

Signed-off-by: Rasesh Mody <rasesh.mody@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/broadcom/Kconfig
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2_fw.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/cnic.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/cnic_if.h
Simple merge