vserver 1.9.5.x5

[linux-2.6.git] / drivers / pci / hotplug / ibmphp_ebda.c

diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 470e9af..aea1187 100644 (file)
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -63,7 +63,7 @@ static LIST_HEAD (rio_vg_head);
 static LIST_HEAD (rio_lo_head);
 static LIST_HEAD (opt_vg_head);
 static LIST_HEAD (opt_lo_head);
-static void *io_mem;
+static void __iomem *io_mem;
 
 /* Local functions */
 static int ebda_rsrc_controller (void);
@@ -1246,7 +1246,7 @@ int ibmphp_register_pci (void)
        list_for_each (tmp, &ebda_hpc_head) {
                ctrl = list_entry (tmp, struct controller, ebda_hpc_list);
                if (ctrl->ctlr_type == 1) {
-                       rc = pci_module_init (&ibmphp_driver);
+                       rc = pci_register_driver(&ibmphp_driver);
                        break;
                }
        }