git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[pandora-kernel.git]
/
drivers
/
pcmcia
/
omap_cf.c
diff --git
a/drivers/pcmcia/omap_cf.c
b/drivers/pcmcia/omap_cf.c
index
a7cfc79
..
0ad06a3
100644
(file)
--- 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)
*sp = SS_READY | SS_DETECT | SS_POWERON | SS_3VCARD;
cf = container_of(s, struct omap_cf_socket, socket);
- s->
irq.AssignedIRQ
= 0;
+ s->
pcmcia_irq
= 0;
s->pci_irq = cf->irq;
} else
*sp = 0;