sfc: Revert SRIOV changes.

This reverts commits:

d92916f71a57582ce7276547510cedb2c10b6bd6 ("sfc: Own header for nic-specific sriov functions,")
25672dba9535b804331145379c79f835ba2205c5 ("sfc: Enable VF's via a write to the sysfs file
 sriov_numvfs")

As they break the build with SRIOV disabled and there is no
easy way to fix it the way things are arranged.

Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/sfc/Makefile
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10.c
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10_sriov.c
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10_sriov.h
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.c
Simple merge

diff --cc drivers/net/ethernet/sfc/efx.h
Simple merge

diff --cc drivers/net/ethernet/sfc/falcon.c
Simple merge

diff --cc drivers/net/ethernet/sfc/farch.c
Simple merge

diff --cc drivers/net/ethernet/sfc/mcdi.c
Simple merge

diff --cc drivers/net/ethernet/sfc/net_driver.h
Simple merge

diff --cc drivers/net/ethernet/sfc/nic.h
Simple merge

diff --cc drivers/net/ethernet/sfc/siena.c
Simple merge

diff --cc drivers/net/ethernet/sfc/siena_sriov.c
Simple merge

diff --cc drivers/net/ethernet/sfc/siena_sriov.h
Simple merge

diff --cc drivers/net/ethernet/sfc/sriov.c
Simple merge

diff --cc drivers/net/ethernet/sfc/sriov.h
Simple merge