upgrade to linux 2.6.10-1.12_FC2

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

diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index bde394f..225973d 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -51,10 +51,10 @@ static u16 unused_IRQ;
  * find the Hot Plug Resource Table in the specified region of memory.
  *
  */
-static void *detect_HRT_floating_pointer(void *begin, void *end)
+static void __iomem *detect_HRT_floating_pointer(void __iomem *begin, void __iomem *end)
 {
-       void *fp;
-       void *endp;
+       void __iomem *fp;
+       void __iomem *endp;
        u8 temp1, temp2, temp3, temp4;
        int status = 0;
 
@@ -194,7 +194,7 @@ static int PCI_ScanBusNonBridge (u8 bus, u8 device)
 
 static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev_num)
 {
-       u8 tdevice;
+       u16 tdevice;
        u32 work;
        u8 tbus;
 
@@ -1162,12 +1162,13 @@ int cpqhp_valid_replace(struct controller *ctrl, struct pci_func * func)
  *
  * returns 0 if success
  */  
-int cpqhp_find_available_resources (struct controller *ctrl, void *rom_start)
+int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_start)
 {
        u8 temp;
        u8 populated_slot;
        u8 bridged_slot;
-       void *one_slot;
+       void __iomem *one_slot;
+       void __iomem *rom_resource_table;
        struct pci_func *func = NULL;
        int i = 10, index;
        u32 temp_dword, rc;
@@ -1175,7 +1176,6 @@ int cpqhp_find_available_resources (struct controller *ctrl, void *rom_start)
        struct pci_resource *p_mem_node;
        struct pci_resource *io_node;
        struct pci_resource *bus_node;
-       void *rom_resource_table;
 
        rom_resource_table = detect_HRT_floating_pointer(rom_start, rom_start+0xffff);
        dbg("rom_resource_table = %p\n", rom_resource_table);