diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-07 10:51:23 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 10:23:12 +0200 |
| commit | 6f840afb416748c15cf55c19b45c4870554c3af1 (patch) | |
| tree | 3d162fe121b35e2c7392c201226c9599f068517b /include | |
| parent | 6f0f38c45a8f2f511c25893e33011ff32fc811db (diff) | |
| download | linux-6f840afb416748c15cf55c19b45c4870554c3af1.tar.bz2 | |
pcmcia: replace struct irq with uint pcmcia_irq in struct pcmcia_socket
As we don't need the "Config" counter any more, we can simplify
struct pcmcia_socket.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/pcmcia/ss.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index 344705cb42f4..764281b29218 100644 --- 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; |