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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
prism54
/
islpci_mgt.c
diff --git
a/drivers/net/wireless/prism54/islpci_mgt.c
b/drivers/net/wireless/prism54/islpci_mgt.c
index
6a60c59
..
2246f79
100644
(file)
--- a/
drivers/net/wireless/prism54/islpci_mgt.c
+++ b/
drivers/net/wireless/prism54/islpci_mgt.c
@@
-1,5
+1,4
@@
/*
/*
- *
* Copyright (C) 2002 Intersil Americas Inc.
* Copyright 2004 Jens Maurer <Jens.Maurer@gmx.net>
*
* Copyright (C) 2002 Intersil Americas Inc.
* Copyright 2004 Jens Maurer <Jens.Maurer@gmx.net>
*
@@
-18,7
+17,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/module.h>
#include <linux/pci.h>
@@
-388,7
+386,7
@@
islpci_mgt_receive(struct net_device *ndev)
/* Create work to handle trap out of interrupt
* context. */
/* Create work to handle trap out of interrupt
* context. */
- INIT_WORK(&frame->ws, prism54_process_trap
, frame
);
+ INIT_WORK(&frame->ws, prism54_process_trap);
schedule_work(&frame->ws);
} else {
schedule_work(&frame->ws);
} else {
@@
-503,7
+501,7
@@
islpci_mgt_transaction(struct net_device *ndev,
printk(KERN_WARNING "%s: timeout waiting for mgmt response\n",
ndev->name);
printk(KERN_WARNING "%s: timeout waiting for mgmt response\n",
ndev->name);
- /* TODO: we should reset the device here */
+ /* TODO: we should reset the device here */
out:
finish_wait(&priv->mgmt_wqueue, &wait);
up(&priv->mgmt_sem);
out:
finish_wait(&priv->mgmt_wqueue, &wait);
up(&priv->mgmt_sem);