diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-07-01 22:29:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-02 16:58:50 -0400 |
commit | dace145374b8e39aeb920304c358ab5e220341ab (patch) | |
tree | e37c76578468f489ce2dbec4d04400380c14ee14 /drivers/pcmcia/yenta_socket.c | |
parent | 8076fe32a7db9a6628589ffa372808e4ba25d222 (diff) |
[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/pcmcia/yenta_socket.c')
-rw-r--r-- | drivers/pcmcia/yenta_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index 47e57602d5ea..1344746381e8 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
@@ -923,7 +923,7 @@ static int yenta_probe_cb_irq(struct yenta_socket *socket) | |||
923 | 923 | ||
924 | socket->probe_status = 0; | 924 | socket->probe_status = 0; |
925 | 925 | ||
926 | if (request_irq(socket->cb_irq, yenta_probe_handler, SA_SHIRQ, "yenta", socket)) { | 926 | if (request_irq(socket->cb_irq, yenta_probe_handler, IRQF_SHARED, "yenta", socket)) { |
927 | printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n"); | 927 | printk(KERN_WARNING "Yenta: request_irq() in yenta_probe_cb_irq() failed!\n"); |
928 | return -1; | 928 | return -1; |
929 | } | 929 | } |
@@ -1172,7 +1172,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i | |||
1172 | 1172 | ||
1173 | /* We must finish initialization here */ | 1173 | /* We must finish initialization here */ |
1174 | 1174 | ||
1175 | if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, SA_SHIRQ, "yenta", socket)) { | 1175 | if (!socket->cb_irq || request_irq(socket->cb_irq, yenta_interrupt, IRQF_SHARED, "yenta", socket)) { |
1176 | /* No IRQ or request_irq failed. Poll */ | 1176 | /* No IRQ or request_irq failed. Poll */ |
1177 | socket->cb_irq = 0; /* But zero is a valid IRQ number. */ | 1177 | socket->cb_irq = 0; /* But zero is a valid IRQ number. */ |
1178 | init_timer(&socket->poll_timer); | 1178 | init_timer(&socket->poll_timer); |