aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/ds.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/ds.c')
-rw-r--r--drivers/pcmcia/ds.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4d11b35d4c3..211aa84353f 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -835,9 +835,11 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
835 struct pcmcia_driver * p_drv = to_pcmcia_drv(drv); 835 struct pcmcia_driver * p_drv = to_pcmcia_drv(drv);
836 struct pcmcia_device_id *did = p_drv->id_table; 836 struct pcmcia_device_id *did = p_drv->id_table;
837 837
838#ifdef CONFIG_PCMCIA_IOCTL
838 /* matching by cardmgr */ 839 /* matching by cardmgr */
839 if (p_dev->cardmgr == p_drv) 840 if (p_dev->cardmgr == p_drv)
840 return 1; 841 return 1;
842#endif
841 843
842 while (did && did->match_flags) { 844 while (did && did->match_flags) {
843 if (pcmcia_devmatch(p_dev, did)) 845 if (pcmcia_devmatch(p_dev, did))