Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / pcmcia / soc_common.h

diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 4fb06f797ad6104d0c0219f3d9438cc221fda137..e40824ce6b0b2f0960be487acb8cedb3e01cb9fb 100644 (file)
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -31,7 +31,6 @@ struct soc_pcmcia_socket {
         * Info from low level handler
         */
        unsigned int            nr;
-       unsigned int            irq;
 
        /*
         * Core PCMCIA state