diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 04:24:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-23 04:24:13 +0200 |
| commit | 21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4 (patch) | |
| tree | a7e9cdcaf0177bb9606d6e5982937cce55df9898 /drivers/net | |
| parent | x86: remove more uaccess_32.h complexity (diff) | |
| parent | sparc64: Reduce TLB flushes during hugepte changes (diff) | |
| download | linux-21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4.tar.xz linux-21f9debf74c3ae8fdd26fd2bc3c0169a08eba6b4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
"Some 32-bit kgdb cleanups from Sam Ravnborg, and a hugepage TLB flush
overhead fix on 64-bit from Nitin Gupta"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Reduce TLB flushes during hugepte changes
aeroflex/greth: fix warning about unused variable
openprom: fix warning
sparc32: drop superfluous cast in calls to __nocache_pa()
sparc32: fix build with STRICT_MM_TYPECHECKS
sparc32: use proper prototype for trapbase
sparc32: drop local prototype in kgdb_32
sparc32: drop hardcoding trap_level in kgdb_trap
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index b873531c5575..bca07c5c94bd 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c @@ -1323,7 +1323,7 @@ static inline int phy_aneg_done(struct phy_device *phydev) static int greth_mdio_init(struct greth_private *greth) { - int ret, phy; + int ret; unsigned long timeout; greth->mdio = mdiobus_alloc(); |