projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
drivers
/
net
/
pcmcia
/
com20020_cs.c
diff --git
a/drivers/net/pcmcia/com20020_cs.c
b/drivers/net/pcmcia/com20020_cs.c
index
91f65e9
..
0d1c7a4
100644
(file)
--- a/
drivers/net/pcmcia/com20020_cs.c
+++ b/
drivers/net/pcmcia/com20020_cs.c
@@
-173,7
+173,6
@@
static int com20020_probe(struct pcmcia_device *p_dev)
p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
p_dev->conf.Attributes = CONF_ENABLE_IRQ;
p_dev->conf.IntType = INT_MEMORY_AND_IO;
- p_dev->conf.Present = PRESENT_OPTION;
p_dev->irq.Instance = info->dev = dev;
p_dev->priv = info;