From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 15 Jan 2006 00:14:31 +0000 (+0100)
Subject: [PATCH] pcmcia: size reduction if ioctl isn't compiled
X-Git-Tag: v2.6.17-rc1~14^2~23
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0fad8f71a8a23fad223b7d72b4ba06d57f764f;p=pandora-kernel.git

[PATCH] pcmcia: size reduction if ioctl isn't compiled

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>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 4d11b35d4c37..211aa84353fc 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) {
 	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))
Reading git-diff-tree failed