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

[~andy/linux] / drivers / misc / hpilo.c

diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index b362d938e929c01541ba3e4ff267232edef0117d..621c7a3733901abc6cf7da5170f1380a3a376ab9 100644 (file)
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -686,7 +686,7 @@ static void ilo_unmap_device(struct pci_dev *pdev, struct ilo_hwinfo *hw)
        pci_iounmap(pdev, hw->mmio_vaddr);
 }
 
-static int __devinit ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw)
+static int ilo_map_device(struct pci_dev *pdev, struct ilo_hwinfo *hw)
 {
        int error = -ENOMEM;
 
@@ -751,7 +751,7 @@ static void ilo_remove(struct pci_dev *pdev)
        ilo_hwdev[(minor / max_ccb)] = 0;
 }
 
-static int __devinit ilo_probe(struct pci_dev *pdev,
+static int ilo_probe(struct pci_dev *pdev,
                               const struct pci_device_id *ent)
 {
        int devnum, minor, start, error = 0;
@@ -859,7 +859,7 @@ static struct pci_driver ilo_driver = {
        .name     = ILO_NAME,
        .id_table = ilo_devices,
        .probe    = ilo_probe,
-       .remove   = __devexit_p(ilo_remove),
+       .remove   = ilo_remove,
 };
 
 static int __init ilo_init(void)