Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuil...

[firefly-linux-kernel-4.4.55.git] / include / pcmcia / ss.h

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 344705cb42f419478fccefeb8cf5479a8d4d8a9b..764281b2921850efa840434b7c76e0ed933be8fe 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -141,10 +141,6 @@ struct pcmcia_socket {
        u_short                         lock_count;
        pccard_mem_map                  cis_mem;
        void __iomem                    *cis_virt;
-       struct {
-               u_int                   AssignedIRQ;
-               u_int                   Config;
-       } irq;
        io_window_t                     io[MAX_IO_WIN];
        pccard_mem_map                  win[MAX_WIN];
        struct list_head                cis_cache;
@@ -235,6 +231,9 @@ struct pcmcia_socket {
        /* non-zero if PCMCIA card is present */
        atomic_t                        present;
 
+       /* IRQ to be used by PCMCIA devices. May not be IRQ 0. */
+       unsigned int                    pcmcia_irq;
+
 #ifdef CONFIG_PCMCIA_IOCTL
        struct user_info_t              *user;
        wait_queue_head_t               queue;