| commit | cd799e167394282ba76bb48ccf398283752e9037 | [log] [tgz] |
|---|---|---|
| author | John W. Linville <linville@tuxdriver.com> | Mon Sep 17 19:30:42 2007 -0400 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Sep 17 19:30:42 2007 -0400 |
| tree | f576f69b215258f64f8acf795ea95e9b527a6bd9 | |
| parent | 98e899b06e05082f0d5161a56385c592be447940 [diff] | |
| parent | 6d29c381d7d771070b8bf74662e9680e09cb40f9 [diff] |
Merge branch 'p54' into everything
diff --git a/drivers/net/wireless/p54pci.c b/drivers/net/wireless/p54pci.c index 4b825ff..114cbaf 100644 --- a/drivers/net/wireless/p54pci.c +++ b/drivers/net/wireless/p54pci.c
@@ -528,7 +528,7 @@ } pci_set_master(pdev); - pci_set_mwi(pdev); + pci_try_set_mwi(pdev); pci_write_config_byte(pdev, 0x40, 0); pci_write_config_byte(pdev, 0x41, 0);