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/scsi/pcmcia/nsp_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/scsi/pcmcia/nsp_cs.c')
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index d72df5dae4ee..e16fe361436e 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -1629,7 +1629,6 @@ static int nsp_cs_probe(struct pcmcia_device *link) | |||
1629 | /* General socket configuration */ | 1629 | /* General socket configuration */ |
1630 | link->conf.Attributes = CONF_ENABLE_IRQ; | 1630 | link->conf.Attributes = CONF_ENABLE_IRQ; |
1631 | link->conf.IntType = INT_MEMORY_AND_IO; | 1631 | link->conf.IntType = INT_MEMORY_AND_IO; |
1632 | link->conf.Present = PRESENT_OPTION; | ||
1633 | 1632 | ||
1634 | ret = nsp_cs_config(link); | 1633 | ret = nsp_cs_config(link); |
1635 | 1634 | ||