diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-09-07 14:18:36 -0700 |
| commit | 7e66eaf14e19c032433be7c4df3c892fa2a5282f (patch) | |
| tree | 56b0d5f9d16eb18744e102f3f216715196cd62e6 /drivers/net/wireless/orinoco/orinoco_pci.c | |
| parent | d3654d7ef3adad0083525cfb6fe27be62cb83d0d (diff) | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
Merge commit 'v3.1-rc4' into next
Diffstat (limited to 'drivers/net/wireless/orinoco/orinoco_pci.c')
| -rw-r--r-- | drivers/net/wireless/orinoco/orinoco_pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_pci.c b/drivers/net/wireless/orinoco/orinoco_pci.c index 468197f8667..6058c66b844 100644 --- a/drivers/net/wireless/orinoco/orinoco_pci.c +++ b/drivers/net/wireless/orinoco/orinoco_pci.c @@ -6,7 +6,7 @@ * hermes registers, as well as the COR register. * * Current maintainers are: - * Pavel Roskin <proski AT gnu.org> + * Pavel Roskin <proski AT gnu.org> * and David Gibson <hermes AT gibson.dropbear.id.au> * * Some of this code is borrowed from orinoco_plx.c @@ -81,7 +81,7 @@ */ static int orinoco_pci_cor_reset(struct orinoco_private *priv) { - hermes_t *hw = &priv->hw; + struct hermes *hw = &priv->hw; unsigned long timeout; u16 reg; |