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/wl3501_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/wl3501_cs.c')
| -rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 583e0d655a98..c250f08c8dd5 100644 --- 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) | |||
| 1928 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; | 1928 | p_dev->conf.Attributes = CONF_ENABLE_IRQ; |
| 1929 | p_dev->conf.IntType = INT_MEMORY_AND_IO; | 1929 | p_dev->conf.IntType = INT_MEMORY_AND_IO; |
| 1930 | p_dev->conf.ConfigIndex = 1; | 1930 | p_dev->conf.ConfigIndex = 1; |
| 1931 | p_dev->conf.Present = PRESENT_OPTION; | ||
| 1932 | 1931 | ||
| 1933 | dev = alloc_etherdev(sizeof(struct wl3501_card)); | 1932 | dev = alloc_etherdev(sizeof(struct wl3501_card)); |
| 1934 | if (!dev) | 1933 | if (!dev) |