diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/sb1250-mac.c | |
| parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
| parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sb1250-mac.c')
| -rw-r--r-- | drivers/net/sb1250-mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 888b7dec9866..295199025173 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
| @@ -1063,7 +1063,7 @@ static void sbmac_netpoll(struct net_device *netdev) | |||
| 1063 | ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), | 1063 | ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), |
| 1064 | sc->sbm_imr); | 1064 | sc->sbm_imr); |
| 1065 | #else | 1065 | #else |
| 1066 | __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | | 1066 | __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | |
| 1067 | (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr); | 1067 | (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr); |
| 1068 | #endif | 1068 | #endif |
| 1069 | } | 1069 | } |