---

yaml --- r: 122176 b: refs/heads/master c: a098397 h: refs/heads/master v: v3
git-mirror · Nov 26, 2008 · 9b369a9 · 9b369a9
1 parent f612b7a
commit 9b369a9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45555c0ed436b8b06eeaa5c524a3377e6d24fb45
+refs/heads/master: a098397d562e2ce5aca7b9b007a4954d88ef8f5e
diff --git a/trunk/drivers/net/atlx/atl2.c b/trunk/drivers/net/atlx/atl2.c
@@ -644,15 +644,13 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
 	int flags, err = 0;
 
 	flags = IRQF_SHARED;
-#ifdef CONFIG_PCI_MSI
 	adapter->have_msi = true;
 	err = pci_enable_msi(adapter->pdev);
 	if (err)
 		adapter->have_msi = false;
 
 	if (adapter->have_msi)
 		flags &= ~IRQF_SHARED;
-#endif
 
 	return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
 		netdev);