Merge remote-tracking branches 'regulator/topic/discharge', 'regulator/topic/fan53555...

[linux-beck.git] / drivers / edac / octeon_edac-pci.c

diff --git a/drivers/edac/octeon_edac-pci.c b/drivers/edac/octeon_edac-pci.c
index 758c1ef5fc9ea12fba2c93d593bf95b4ceb93c07..9ca73cec74e75a7d4476d3f387ccfb7a022dc1a0 100644 (file)
--- a/drivers/edac/octeon_edac-pci.c
+++ b/drivers/edac/octeon_edac-pci.c
@@ -58,7 +58,7 @@ static void octeon_pci_poll(struct edac_pci_ctl_info *pci)
        }
 }
 
-static int __devinit octeon_pci_probe(struct platform_device *pdev)
+static int octeon_pci_probe(struct platform_device *pdev)
 {
        struct edac_pci_ctl_info *pci;
        int res = 0;