sfc: Move more Falcon-specific code and definitions into falcon.c
authorBen Hutchings <bhutchings@solarflare.com>
Thu, 13 Sep 2012 00:11:31 +0000 (01:11 +0100)
committerBen Hutchings <bhutchings@solarflare.com>
Wed, 21 Aug 2013 15:35:20 +0000 (16:35 +0100)
In particular, fold in the whole of falcon_xmac.c.

Drop some entirely unused definitions.

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
drivers/net/ethernet/sfc/Makefile
drivers/net/ethernet/sfc/falcon.c
drivers/net/ethernet/sfc/falcon_xmac.c [deleted file]
drivers/net/ethernet/sfc/nic.h
drivers/net/ethernet/sfc/regs.h

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