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 branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
pcmcia
/
soc_common.c
diff --git
a/drivers/pcmcia/soc_common.c
b/drivers/pcmcia/soc_common.c
index
8ef3f91
..
ecaa132
100644
(file)
--- a/
drivers/pcmcia/soc_common.c
+++ b/
drivers/pcmcia/soc_common.c
@@
-523,7
+523,7
@@
int soc_pcmcia_request_irqs(struct soc_pcmcia_socket *skt,
if (irqs[i].sock != skt->nr)
continue;
res = request_irq(irqs[i].irq, soc_common_pcmcia_interrupt,
-
SA_INTERRUPT
, irqs[i].str, skt);
+
IRQF_DISABLED
, irqs[i].str, skt);
if (res)
break;
set_irq_type(irqs[i].irq, IRQT_NOEDGE);