diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-08 20:39:29 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-12-08 20:39:29 -0500 |
| commit | ba00410b8131b23edfb0e09f8b6dd26c8eb621fb (patch) | |
| tree | c08504e4d2fa51ac91cef544f336d0169806c49f /drivers/net/ethernet/smsc/smc91x.h | |
| parent | 8ce74dd6057832618957fc2cbd38fa959c3a0a6c (diff) | |
| parent | aa583096d9767892983332e7c1a984bd17e3cd39 (diff) | |
Merge branch 'iov_iter' into for-next
Diffstat (limited to 'drivers/net/ethernet/smsc/smc91x.h')
| -rw-r--r-- | drivers/net/ethernet/smsc/smc91x.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/smsc/smc91x.h b/drivers/net/ethernet/smsc/smc91x.h index 47dce918eb0f..2a38dacbbd27 100644 --- a/drivers/net/ethernet/smsc/smc91x.h +++ b/drivers/net/ethernet/smsc/smc91x.h | |||
| @@ -298,6 +298,9 @@ struct smc_local { | |||
| 298 | struct sk_buff *pending_tx_skb; | 298 | struct sk_buff *pending_tx_skb; |
| 299 | struct tasklet_struct tx_task; | 299 | struct tasklet_struct tx_task; |
| 300 | 300 | ||
| 301 | struct gpio_desc *power_gpio; | ||
| 302 | struct gpio_desc *reset_gpio; | ||
| 303 | |||
| 301 | /* version/revision of the SMC91x chip */ | 304 | /* version/revision of the SMC91x chip */ |
| 302 | int version; | 305 | int version; |
| 303 | 306 | ||