From 9b369a9e5653bb36eaa58a073739d96a790b2460 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 25 Nov 2008 17:00:05 -0800
Subject: [PATCH] --- yaml --- r: 122176 b: refs/heads/master c:
 a098397d562e2ce5aca7b9b007a4954d88ef8f5e h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/atlx/atl2.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a7094d2b2be0..44ffe5768beb 100644
--- 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
index 0326a84503e3..bc394491b63b 100644
--- a/trunk/drivers/net/atlx/atl2.c
+++ b/trunk/drivers/net/atlx/atl2.c
@@ -644,7 +644,6 @@ 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)
@@ -652,7 +651,6 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
 
 	if (adapter->have_msi)
 		flags &= ~IRQF_SHARED;
-#endif
 
 	return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
 		netdev);