Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

[linux-2.6-block.git] / drivers / pinctrl / spear / pinctrl-plgpio.c

diff --git a/drivers/pinctrl/spear/pinctrl-plgpio.c b/drivers/pinctrl/spear/pinctrl-plgpio.c
index 295b349a05cf6deef7f05853c553f42018fcf0dc..3e5a887216b8ae8688cb4a32b38a4beeeef1b118 100644 (file)
--- a/drivers/pinctrl/spear/pinctrl-plgpio.c
+++ b/drivers/pinctrl/spear/pinctrl-plgpio.c
@@ -15,12 +15,12 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
+#include <linux/irqchip/chained_irq.h>
 #include <linux/module.h>
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/spinlock.h>
-#include <asm/mach/irq.h>
 
 #define MAX_GPIO_PER_REG               32
 #define PIN_OFFSET(pin)                        (pin % MAX_GPIO_PER_REG)
@@ -75,7 +75,7 @@ struct plgpio {
        int                     (*o2p)(int offset);     /* offset_to_pin */
        u32                     p2o_regs;
        struct plgpio_regs      regs;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        struct plgpio_regs      *csave_regs;
 #endif
 };
@@ -554,7 +554,7 @@ static int plgpio_probe(struct platform_device *pdev)
        if (IS_ERR(plgpio->clk))
                dev_warn(&pdev->dev, "clk_get() failed, work without it\n");
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        plgpio->csave_regs = devm_kzalloc(&pdev->dev,
                        sizeof(*plgpio->csave_regs) *
                        DIV_ROUND_UP(plgpio->chip.ngpio, MAX_GPIO_PER_REG),
@@ -641,7 +641,7 @@ unprepare_clk:
        return ret;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int plgpio_suspend(struct device *dev)
 {
        struct plgpio *plgpio = dev_get_drvdata(dev);