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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
net
/
wireless
/
ipw2100.c
diff --git
a/drivers/net/wireless/ipw2100.c
b/drivers/net/wireless/ipw2100.c
index
e955db4
..
72335c8
100644
(file)
--- a/
drivers/net/wireless/ipw2100.c
+++ b/
drivers/net/wireless/ipw2100.c
@@
-134,6
+134,7
@@
that only one external action is invoked at a time.
*/
#include <linux/compiler.h>
*/
#include <linux/compiler.h>
+#include <linux/config.h>
#include <linux/errno.h>
#include <linux/if_arp.h>
#include <linux/in6.h>
#include <linux/errno.h>
#include <linux/if_arp.h>
#include <linux/in6.h>
@@
-1484,7
+1485,7
@@
static int ipw2100_hw_stop_adapter(struct ipw2100_priv *priv)
*
* Sending the PREPARE_FOR_POWER_DOWN will restrict the
* hardware from going into standby mode and will transition
*
* Sending the PREPARE_FOR_POWER_DOWN will restrict the
* hardware from going into standby mode and will transition
- * out of D0-stand
b
y if it is already in that state.
+ * out of D0-standy if it is already in that state.
*
* STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
* driver upon completion. Once received, the driver can
*
* STATUS_PREPARE_POWER_DOWN_COMPLETE will be sent by the
* driver upon completion. Once received, the driver can
@@
-5357,7
+5358,7
@@
static int ipw2100_set_key(struct ipw2100_priv *priv,
idx, keylen, len);
/* NOTE: We don't check cached values in case the firmware was reset
idx, keylen, len);
/* NOTE: We don't check cached values in case the firmware was reset
- * or some other problem is occur
r
ing. If the user is setting the key,
+ * or some other problem is occuring. If the user is setting the key,
* then we push the change */
wep_key->idx = idx;
* then we push the change */
wep_key->idx = idx;
@@
-6229,7
+6230,7
@@
static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
ipw2100_queues_initialize(priv);
err = request_irq(pci_dev->irq,
ipw2100_queues_initialize(priv);
err = request_irq(pci_dev->irq,
- ipw2100_interrupt,
IRQF_SHARED
, dev->name, priv);
+ ipw2100_interrupt,
SA_SHIRQ
, dev->name, priv);
if (err) {
printk(KERN_WARNING DRV_NAME
"Error calling request_irq: %d.\n", pci_dev->irq);
if (err) {
printk(KERN_WARNING DRV_NAME
"Error calling request_irq: %d.\n", pci_dev->irq);