Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index 27575e6378a1..01757f18a208 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -181,7 +181,7 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock)
                 /* all other (older) Db1x00 boards use a GPIO to show
                  * card detection status:  use both-edge triggers.
                  */
-                set_irq_type(sock->insert_irq, IRQ_TYPE_EDGE_BOTH);
+                irq_set_irq_type(sock->insert_irq, IRQ_TYPE_EDGE_BOTH);
                 ret = request_irq(sock->insert_irq, db1000_pcmcia_cdirq,
                                   0, "pcmcia_carddetect", sock);