vserver 1.9.5.x5

[linux-2.6.git] / drivers / pci / hotplug / cpqphp_nvram.h

diff --git a/drivers/pci/hotplug/cpqphp_nvram.h b/drivers/pci/hotplug/cpqphp_nvram.h
index 9ed417b..e89c070 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_nvram.h
+++ b/drivers/pci/hotplug/cpqphp_nvram.h
@@ -30,26 +30,26 @@
 
 #ifndef CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM
 
-static inline void compaq_nvram_init (void *rom_start)
+static inline void compaq_nvram_init (void __iomem *rom_start)
 {
        return;
 }
 
-static inline int compaq_nvram_load (void *rom_start, struct controller *ctrl)
+static inline int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
 {
        return 0;
 }
 
-static inline int compaq_nvram_store (void *rom_start)
+static inline int compaq_nvram_store (void __iomem *rom_start)
 {
        return 0;
 }
 
 #else
 
-extern void compaq_nvram_init  (void *rom_start);
-extern int compaq_nvram_load   (void *rom_start, struct controller *ctrl);
-extern int compaq_nvram_store  (void *rom_start);
+extern void compaq_nvram_init  (void __iomem *rom_start);
+extern int compaq_nvram_load   (void __iomem *rom_start, struct controller *ctrl);
+extern int compaq_nvram_store  (void __iomem *rom_start);
 
 #endif