git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
atm
/
nicstar.c
diff --git
a/drivers/atm/nicstar.c
b/drivers/atm/nicstar.c
index
074abc8
..
b803689
100644
(file)
--- a/
drivers/atm/nicstar.c
+++ b/
drivers/atm/nicstar.c
@@
-36,7
+36,6
@@
/* Header files ***************************************************************/
#include <linux/module.h>
/* Header files ***************************************************************/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/atmdev.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/atmdev.h>
@@
-626,7
+625,7
@@
static int __devinit ns_init_card(int i, struct pci_dev *pcidev)
if (mac[i] == NULL)
nicstar_init_eprom(card->membase);
if (mac[i] == NULL)
nicstar_init_eprom(card->membase);
- if (request_irq(pcidev->irq, &ns_irq_handler,
SA_INTERRUPT | SA_SHIRQ
, "nicstar", card) != 0)
+ if (request_irq(pcidev->irq, &ns_irq_handler,
IRQF_DISABLED | IRQF_SHARED
, "nicstar", card) != 0)
{
printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
error = 9;
{
printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
error = 9;