gpio: pxa: fixes non devicetree builds

The commit "gpio: pxa: change the interrupt management" should have
taken care of moving an ifdef to not englobe irqdomain related
structures anymore, as they are used now for all builds.

This repairs the broken builds where CONFIG_OF=n.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index eacb4b9..c2d1a47 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -554,19 +554,6 @@ static int pxa_gpio_nums(struct platform_device *pdev)
        return count;
 }
 
-#ifdef CONFIG_OF
-static const struct of_device_id pxa_gpio_dt_ids[] = {
-       { .compatible = "intel,pxa25x-gpio",    .data = &pxa25x_id, },
-       { .compatible = "intel,pxa26x-gpio",    .data = &pxa26x_id, },
-       { .compatible = "intel,pxa27x-gpio",    .data = &pxa27x_id, },
-       { .compatible = "intel,pxa3xx-gpio",    .data = &pxa3xx_id, },
-       { .compatible = "marvell,pxa93x-gpio",  .data = &pxa93x_id, },
-       { .compatible = "marvell,mmp-gpio",     .data = &mmp_id, },
-       { .compatible = "marvell,mmp2-gpio",    .data = &mmp2_id, },
-       { .compatible = "marvell,pxa1928-gpio", .data = &pxa1928_id, },
-       {}
-};
-
 static int pxa_irq_domain_map(struct irq_domain *d, unsigned int irq,
                              irq_hw_number_t hw)
 {
@@ -582,6 +569,19 @@ const struct irq_domain_ops pxa_irq_domain_ops = {
        .xlate  = irq_domain_xlate_twocell,
 };
 
+#ifdef CONFIG_OF
+static const struct of_device_id pxa_gpio_dt_ids[] = {
+       { .compatible = "intel,pxa25x-gpio",    .data = &pxa25x_id, },
+       { .compatible = "intel,pxa26x-gpio",    .data = &pxa26x_id, },
+       { .compatible = "intel,pxa27x-gpio",    .data = &pxa27x_id, },
+       { .compatible = "intel,pxa3xx-gpio",    .data = &pxa3xx_id, },
+       { .compatible = "marvell,pxa93x-gpio",  .data = &pxa93x_id, },
+       { .compatible = "marvell,mmp-gpio",     .data = &mmp_id, },
+       { .compatible = "marvell,mmp2-gpio",    .data = &mmp2_id, },
+       { .compatible = "marvell,pxa1928-gpio", .data = &pxa1928_id, },
+       {}
+};
+
 static int pxa_gpio_probe_dt(struct platform_device *pdev,
                             struct pxa_gpio_chip *pchip)
 {