git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
wl3501_cs.c
diff --git
a/drivers/net/wireless/wl3501_cs.c
b/drivers/net/wireless/wl3501_cs.c
index
583e0d6
..
c250f08
100644
(file)
--- a/
drivers/net/wireless/wl3501_cs.c
+++ b/
drivers/net/wireless/wl3501_cs.c
@@
-1928,7
+1928,6
@@
static int wl3501_probe(struct pcmcia_device *p_dev)
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
p_dev->conf.IntType = INT_MEMORY_AND_IO;
p_dev->conf.ConfigIndex = 1;
- p_dev->conf.Present = PRESENT_OPTION;
dev = alloc_etherdev(sizeof(struct wl3501_card));
if (!dev)