Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / pinctrl / pinctrl-sirf.c

diff --git a/drivers/pinctrl/pinctrl-sirf.c b/drivers/pinctrl/pinctrl-sirf.c
index a3905e58d1b395de11923f3fc2ea759de9f8f059..a4f0c5e487d5eae6c2b1f29c5aebf596df2f40d2 100644 (file)
--- a/drivers/pinctrl/pinctrl-sirf.c
+++ b/drivers/pinctrl/pinctrl-sirf.c
@@ -1305,7 +1305,7 @@ out_no_gpio_remap:
        return ret;
 }
 
-static const struct of_device_id pinmux_ids[] __devinitconst = {
+static const struct of_device_id pinmux_ids[] = {
        { .compatible = "sirf,prima2-pinctrl" },
        { .compatible = "sirf,marco-pinctrl" },
        {}