Merge tag 'v3.8-rc5' into x86/mm

[karo-tx-linux.git] / drivers / gpio / gpio-msic.c

diff --git a/drivers/gpio/gpio-msic.c b/drivers/gpio/gpio-msic.c
index b38986285868ab96151c2c522463ccfb377aeae1..27ea7b9257ff7ce0eb25ff765e275b36c3a1372f 100644 (file)
--- a/drivers/gpio/gpio-msic.c
+++ b/drivers/gpio/gpio-msic.c
@@ -256,7 +256,7 @@ static void msic_gpio_irq_handler(unsigned irq, struct irq_desc *desc)
        chip->irq_eoi(data);
 }
 
-static int __devinit platform_msic_gpio_probe(struct platform_device *pdev)
+static int platform_msic_gpio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct intel_msic_gpio_pdata *pdata = dev->platform_data;