[PATCH] pcmcia: size reduction if ioctl isn't compiled
authorDominik Brodowski <linux@dominikbrodowski.net>
Sun, 15 Jan 2006 00:14:31 +0000 (01:14 +0100)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 31 Mar 2006 15:02:39 +0000 (17:02 +0200)
If the kernel is configured to not include the deprecated PCMCIA ioctl,
some code doesn't need to be built.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
drivers/pcmcia/ds.c
drivers/pcmcia/ds_internal.h
drivers/pcmcia/rsrc_mgr.c
include/pcmcia/ds.h

index 4d11b35..211aa84 100644 (file)
@@ -835,9 +835,11 @@ static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {
        struct pcmcia_driver * p_drv = to_pcmcia_drv(drv);
        struct pcmcia_device_id *did = p_drv->id_table;
 
+#ifdef CONFIG_PCMCIA_IOCTL
        /* matching by cardmgr */
        if (p_dev->cardmgr == p_drv)
                return 1;
+#endif
 
        while (did && did->match_flags) {
                if (pcmcia_devmatch(p_dev, did))
Simple merge
Simple merge
Simple merge