diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-22 17:51:16 -0400 |
| commit | 41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (patch) | |
| tree | d5c8f24075313edfe548256dd931527f1569921e /drivers/net/wireless/orinoco/orinoco_pci.c | |
| parent | 415b3334a21aa67806c52d1acf4e72e14f7f402f (diff) | |
| parent | 6e6e8c510a84fe3237ef02b954e58cca6a3f4b1a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
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; |