Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index b4a76cade646..5d1c6c95262c 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -34,7 +34,6 @@ static char const rcsid[] =
 
 
 #include <linux/module.h>
-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/skbuff.h>
 #include <linux/kernel.h>
@@ -3387,7 +3386,7 @@ init_card(struct atm_dev *dev)
                 writel(SAR_STAT_TMROF, SAR_REG_STAT);
         }
         IPRINTK("%s: Request IRQ ... ", card->name);
-        if (request_irq(pcidev->irq, idt77252_interrupt, SA_INTERRUPT|SA_SHIRQ,
+        if (request_irq(pcidev->irq, idt77252_interrupt, IRQF_DISABLED|IRQF_SHARED,
                         card->name, card) != 0) {
                 printk("%s: can't allocate IRQ.\n", card->name);
                 deinit_card(card);