Merge branch 'master' into for-next

Conflicts:
	include/linux/mmzone.h

Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

2 files changed, 6 insertions, 5 deletions

diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index 47f18d6bce46..6790a812a1db 100644
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -73,7 +73,7 @@ static int __devinit wm831x_on_probe(struct platform_device *pdev)
 {
         struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
         struct wm831x_on *wm831x_on;
-        int irq = platform_get_irq(pdev, 0);
+        int irq = wm831x_irq(wm831x, platform_get_irq(pdev, 0));
         int ret;
 
         wm831x_on = kzalloc(sizeof(struct wm831x_on), GFP_KERNEL);
diff --git a/drivers/input/touchscreen/wm831x-ts.c b/drivers/input/touchscreen/wm831x-ts.c
index 4bc851a9dc3d..e83410721e38 100644
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
@@ -260,15 +260,16 @@ static __devinit int wm831x_ts_probe(struct platform_device *pdev)
          * If we have a direct IRQ use it, otherwise use the interrupt
          * from the WM831x IRQ controller.
          */
+        wm831x_ts->data_irq = wm831x_irq(wm831x,
+                                         platform_get_irq_byname(pdev,
+                                                                 "TCHDATA"));
         if (pdata && pdata->data_irq)
                 wm831x_ts->data_irq = pdata->data_irq;
-        else
-                wm831x_ts->data_irq = platform_get_irq_byname(pdev, "TCHDATA");
 
+        wm831x_ts->pd_irq = wm831x_irq(wm831x,
+                                       platform_get_irq_byname(pdev, "TCHPD"));
         if (pdata && pdata->pd_irq)
                 wm831x_ts->pd_irq = pdata->pd_irq;
-        else
-                wm831x_ts->pd_irq = platform_get_irq_byname(pdev, "TCHPD");
 
         if (pdata)
                 wm831x_ts->pressure = pdata->pressure;