summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/bfin_cf_pcmcia.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-03-07 12:51:23 +0300
committerDominik Brodowski <linux@dominikbrodowski.net>2010-05-10 12:23:12 +0400
commit6f840afb416748c15cf55c19b45c4870554c3af1 (patch)
tree3d162fe121b35e2c7392c201226c9599f068517b /drivers/pcmcia/bfin_cf_pcmcia.c
parent6f0f38c45a8f2f511c25893e33011ff32fc811db (diff)
downloadlinux-6f840afb416748c15cf55c19b45c4870554c3af1.tar.xz
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/bfin_cf_pcmcia.c')
-rw-r--r--drivers/pcmcia/bfin_cf_pcmcia.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c
index 9e84d039de41..eae9cbe37a3e 100644
--- a/drivers/pcmcia/bfin_cf_pcmcia.c
+++ b/drivers/pcmcia/bfin_cf_pcmcia.c
@@ -113,7 +113,7 @@ static int bfin_cf_get_status(struct pcmcia_socket *s, u_int *sp)
if (bfin_cf_present(cf->cd_pfx)) {
*sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
- s->irq.AssignedIRQ = 0;
+ s->pcmcia_irq = 0;
s->pci_irq = cf->irq;
} else