diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /drivers/net/hp100.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'drivers/net/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index dd8665138062..90f890e7c5e1 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
| @@ -993,8 +993,8 @@ static void hp100_mmuinit(struct net_device *dev) | |||
| 993 | if (lp->mode == 1) { /* only needed for Busmaster */ | 993 | if (lp->mode == 1) { /* only needed for Busmaster */ |
| 994 | int xmit_stop, recv_stop; | 994 | int xmit_stop, recv_stop; |
| 995 | 995 | ||
| 996 | if ((lp->chip == HP100_CHIPID_RAINIER) | 996 | if ((lp->chip == HP100_CHIPID_RAINIER) || |
| 997 | || (lp->chip == HP100_CHIPID_SHASTA)) { | 997 | (lp->chip == HP100_CHIPID_SHASTA)) { |
| 998 | int pdl_stop; | 998 | int pdl_stop; |
| 999 | 999 | ||
| 1000 | /* | 1000 | /* |