drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Fri, 30 May 2014 19:39:30 +0000 (15:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 2 Jun 2014 23:45:34 +0000 (16:45 -0700)
commit3afc557d77d090adbabe52c0f40f11626709b37a
tree10b5c4dd3b0b12475cc41b6ccbf8322df281e17f
parent30f38d2fdd79f13fc929489f7e6e517b4a4bfe63
drivers/net: fix broadcom/bcmsysport.c compile fail on SPARC

To fix:

  CC      drivers/net/ethernet/broadcom/bcmsysport.o
In file included from drivers/net/ethernet/broadcom/bcmsysport.c:28:0:
drivers/net/ethernet/broadcom/bcmsysport.h:41:8: error: redefinition of 'struct tsb'
arch/sparc/include/asm/mmu_64.h:65:8: note: originally defined here
make[1]: *** [drivers/net/ethernet/broadcom/bcmsysport.o] Error 1

we change struct tsb to struct bcm_tsb in the broadcom driver in
order to avoid the namespace collision.  For consistency, we also
change struct rsb to struct bcm_rsb, so the Rx/Tx symmetry is
maintained.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bcmsysport.c
drivers/net/ethernet/broadcom/bcmsysport.h