diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-07 04:51:23 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-05-10 04:23:12 -0400 |
commit | 6f840afb416748c15cf55c19b45c4870554c3af1 (patch) | |
tree | 3d162fe121b35e2c7392c201226c9599f068517b /drivers/pcmcia/omap_cf.c | |
parent | 6f0f38c45a8f2f511c25893e33011ff32fc811db (diff) |
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 'drivers/pcmcia/omap_cf.c')
-rw-r--r-- | drivers/pcmcia/omap_cf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index a7cfc7964c7c..0ad06a3bd562 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c | |||
@@ -117,7 +117,7 @@ static int omap_cf_get_status(struct pcmcia_socket *s, u_int *sp) | |||
117 | 117 | ||
118 | *sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD; | 118 | *sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD; |
119 | cf = container_of(s, struct omap_cf_socket, socket); | 119 | cf = container_of(s, struct omap_cf_socket, socket); |
120 | s->irq.AssignedIRQ = 0; | 120 | s->pcmcia_irq = 0; |
121 | s->pci_irq = cf->irq; | 121 | s->pci_irq = cf->irq; |
122 | } else | 122 | } else |
123 | *sp = 0; | 123 | *sp = 0; |