diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-27 02:48:40 -0500 |
| commit | 5b9ab2ec04ec1e1e53939768805612ac191d7ba2 (patch) | |
| tree | 22d29905c148d2d743b3eccb585fbe60fb91e25a /drivers/net/sungem.c | |
| parent | 851fd7bd88524bb4e20f3def3127cd9167d6d0cf (diff) | |
| parent | 3ec192559033ed457f0d7856838654c100fc659f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/hp-plus.c
drivers/net/wireless/ath5k/base.c
drivers/net/wireless/ath9k/recv.c
net/wireless/reg.c
Diffstat (limited to 'drivers/net/sungem.c')
| -rw-r--r-- | drivers/net/sungem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 44be8dfbcf17..6f935cd30176 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -1713,7 +1713,7 @@ static void gem_init_phy(struct gem *gp) | |||
| 1713 | /* Reset PCS unit. */ | 1713 | /* Reset PCS unit. */ |
| 1714 | val = readl(gp->regs + PCS_MIICTRL); | 1714 | val = readl(gp->regs + PCS_MIICTRL); |
| 1715 | val |= PCS_MIICTRL_RST; | 1715 | val |= PCS_MIICTRL_RST; |
| 1716 | writeb(val, gp->regs + PCS_MIICTRL); | 1716 | writel(val, gp->regs + PCS_MIICTRL); |
| 1717 | 1717 | ||
| 1718 | limit = 32; | 1718 | limit = 32; |
| 1719 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { | 1719 | while (readl(gp->regs + PCS_MIICTRL) & PCS_MIICTRL_RST) { |