diff options
| author | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-12-06 22:14:09 -0500 |
| commit | fc457fa7c0cdbfe96812ba377e508880d600298f (patch) | |
| tree | 514049d61cf8b1587141a375ba3ec4f71e09a9db /drivers/net/wireless/airo.c | |
| parent | cc6e8de8f0fab61760bb7091fb19eef1406e17be (diff) | |
| parent | e4f5c82a92c2a546a16af1614114eec19120e40a (diff) | |
Merge ../linus/
Diffstat (limited to 'drivers/net/wireless/airo.c')
| -rw-r--r-- | drivers/net/wireless/airo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 340ab4ee4b67..7a92b1cbd6aa 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
| @@ -2755,8 +2755,8 @@ static struct net_device *_init_airo_card( unsigned short irq, int port, | |||
| 2755 | SET_NETDEV_DEV(dev, dmdev); | 2755 | SET_NETDEV_DEV(dev, dmdev); |
| 2756 | 2756 | ||
| 2757 | 2757 | ||
| 2758 | if (test_bit(FLAG_MPI,&ai->flags)) | 2758 | reset_card (dev, 1); |
| 2759 | reset_card (dev, 1); | 2759 | msleep(400); |
| 2760 | 2760 | ||
| 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); | 2761 | rc = request_irq( dev->irq, airo_interrupt, SA_SHIRQ, dev->name, dev ); |
| 2762 | if (rc) { | 2762 | if (rc) { |