Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index c35f1a73bc8..52fdf60bdbe 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -178,7 +178,7 @@ static int __init xen_hvc_init(void)
         if (xencons_irq < 0)
                 xencons_irq = 0; /* NO_IRQ */
         else
-                set_irq_noprobe(xencons_irq);
+                irq_set_noprobe(xencons_irq);
 
         hp = hvc_alloc(HVC_COOKIE, xencons_irq, ops, 256);
         if (IS_ERR(hp))
diff --git a/drivers/tty/serial/msm_serial_hs.c b/drivers/tty/serial/msm_serial_hs.c
index 2e7fc9cee9c..b906f11f7c1 100644
--- a/drivers/tty/serial/msm_serial_hs.c
+++ b/drivers/tty/serial/msm_serial_hs.c
@@ -1644,7 +1644,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
         if (unlikely(uport->irq < 0))
                 return -ENXIO;
 
-        if (unlikely(set_irq_wake(uport->irq, 1)))
+        if (unlikely(irq_set_irq_wake(uport->irq, 1)))
                 return -ENXIO;
 
         if (pdata == NULL || pdata->rx_wakeup_irq < 0)
@@ -1658,7 +1658,7 @@ static int __devinit msm_hs_probe(struct platform_device *pdev)
                 if (unlikely(msm_uport->rx_wakeup.irq < 0))
                         return -ENXIO;
 
-                if (unlikely(set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
+                if (unlikely(irq_set_irq_wake(msm_uport->rx_wakeup.irq, 1)))
                         return -ENXIO;
         }