/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'

[~andy/linux] / drivers / pcmcia / pcmcia_resource.c

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index ec2abb37f40731346f097f5a33aea0be33e02850..6f9fdb276402935bec47e407d014dbf30f921dff 100644 (file)
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -23,7 +23,6 @@
 #include <linux/device.h>
 
 #define IN_CARD_SERVICES
-#include <pcmcia/version.h>
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
 #include <pcmcia/cs.h>
@@ -801,7 +800,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
        } else {
                int try;
                u32 mask = s->irq_mask;
-               void *data = NULL;
+               void *data = &p_dev->dev.driver; /* something unique to this device */
 
                for (try = 0; try < 64; try++) {
                        irq = try % 32;