diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index a9af0d78442..0bdda5b3ed5 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c @@ -514,7 +514,9 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev) } /* Pick memory or I/O card, DMA mode, interrupt */ - if (p_dev->_io) + if (p_dev->_io || flags & CONF_ENABLE_IRQ) + flags |= CONF_ENABLE_IOCARD; + if (flags & CONF_ENABLE_IOCARD) s->socket.flags |= SS_IOCARD; if (flags & CONF_ENABLE_SPKR) { s->socket.flags |= SS_SPKR_ENA; diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index fc772a8a55c..6b7372eed90 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -496,7 +496,6 @@ static int dio700_pcmcia_config_loop(struct pcmcia_device *p_dev, static void dio700_config(struct pcmcia_device *link) { - win_req_t req; int ret; printk(KERN_INFO "ni_daq_700: cs-config\n"); |