Merge branch 'bnxt_en-Fix-kbuild-errors-and-rename-phys_port_name'
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Jul 2017 19:48:20 +0000 (12:48 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jul 2017 19:48:20 +0000 (12:48 -0700)
commit34c8c10a766c8daf42293664f5c9ca5516fa3f41
treead49fbd2ddb2214efd045008417397b9bd367821
parent51e3ea3f6bf031439073b7da5afee2a03f606b0c
parent53f70b8b5aa06db53eb06f092342e6073891729a
Merge branch 'bnxt_en-Fix-kbuild-errors-and-rename-phys_port_name'

Michael Chan says:

====================
bnxt_en: Fix kbuild errors and rename phys_port_name.

Fix 2 more kbuild errors (the first one already fixed by DaveM), and rename
the physical port name.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>