diff options
| author | Daniel Ritz <daniel.ritz-ml@swissonline.ch> | 2006-12-08 12:07:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:24:39 -0500 |
| commit | e176d397ad73ca76936e5638c2c81740dedb9d5d (patch) | |
| tree | 5de71fed620d69440e7c7b294d4d001bfeda2448 /drivers/net/wireless/netwave_cs.c | |
| parent | aae7d14f619c665b83e07013e3dda8694ea3e40b (diff) | |
[PATCH] PCMCIA: fix drivers broken by recent cleanup
Setting .ConfigBase and .Present is now done at the pcmcia core.
The driver cleanup missed a few places where the driver did set .Present
to PRESENT_OPTION and later to the values from the CIS. Setting to
PRESENT_OPTION now overrides the values from the CIS. So just remove
those lines.
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/wireless/netwave_cs.c')
| -rw-r--r-- | drivers/net/wireless/netwave_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c index 644b4741ef74..a009ab517710 100644 --- a/drivers/net/wireless/netwave_cs.c +++ b/drivers/net/wireless/netwave_cs.c | |||
| @@ -406,7 +406,6 @@ static int netwave_probe(struct pcmcia_device *link) | |||
| 406 | link->conf.Attributes = CONF_ENABLE_IRQ; | 406 | link->conf.Attributes = CONF_ENABLE_IRQ; |
| 407 | link->conf.IntType = INT_MEMORY_AND_IO; | 407 | link->conf.IntType = INT_MEMORY_AND_IO; |
| 408 | link->conf.ConfigIndex = 1; | 408 | link->conf.ConfigIndex = 1; |
| 409 | link->conf.Present = PRESENT_OPTION; | ||
| 410 | 409 | ||
| 411 | /* Netwave private struct init. link/dev/node already taken care of, | 410 | /* Netwave private struct init. link/dev/node already taken care of, |
| 412 | * other stuff zero'd - Jean II */ | 411 | * other stuff zero'd - Jean II */ |