projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] IB/core: use correct gfp_mask in sa_query
[powerpc.git]
/
drivers
/
net
/
wireless
/
orinoco_nortel.c
diff --git
a/drivers/net/wireless/orinoco_nortel.c
b/drivers/net/wireless/orinoco_nortel.c
index
74b9d5b
..
bf05b90
100644
(file)
--- a/
drivers/net/wireless/orinoco_nortel.c
+++ b/
drivers/net/wireless/orinoco_nortel.c
@@
-40,7
+40,6
@@
#define DRIVER_NAME "orinoco_nortel"
#define PFX DRIVER_NAME ": "
#define DRIVER_NAME "orinoco_nortel"
#define PFX DRIVER_NAME ": "
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-199,7
+198,7
@@
static int orinoco_nortel_init_one(struct pci_dev *pdev,
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
hermes_struct_init(&priv->hw, hermes_io, HERMES_16BIT_REGSPACING);
- err = request_irq(pdev->irq, orinoco_interrupt,
SA_SHIRQ
,
+ err = request_irq(pdev->irq, orinoco_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);
dev->name, dev);
if (err) {
printk(KERN_ERR PFX "Cannot allocate IRQ %d\n", pdev->irq);