diff options
-rw-r--r-- | drivers/pci/rom.c | 6 | ||||
-rw-r--r-- | include/linux/pci.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index dbbcc04abd1..a98b2470b9e 100644 --- a/drivers/pci/rom.c +++ b/drivers/pci/rom.c | |||
@@ -162,6 +162,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) | |||
162 | return rom; | 162 | return rom; |
163 | } | 163 | } |
164 | 164 | ||
165 | #if 0 | ||
165 | /** | 166 | /** |
166 | * pci_map_rom_copy - map a PCI ROM to kernel space, create a copy | 167 | * pci_map_rom_copy - map a PCI ROM to kernel space, create a copy |
167 | * @pdev: pointer to pci device struct | 168 | * @pdev: pointer to pci device struct |
@@ -196,6 +197,7 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size) | |||
196 | 197 | ||
197 | return (void __iomem *)(unsigned long)res->start; | 198 | return (void __iomem *)(unsigned long)res->start; |
198 | } | 199 | } |
200 | #endif /* 0 */ | ||
199 | 201 | ||
200 | /** | 202 | /** |
201 | * pci_unmap_rom - unmap the ROM from kernel space | 203 | * pci_unmap_rom - unmap the ROM from kernel space |
@@ -218,6 +220,7 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom) | |||
218 | pci_disable_rom(pdev); | 220 | pci_disable_rom(pdev); |
219 | } | 221 | } |
220 | 222 | ||
223 | #if 0 | ||
221 | /** | 224 | /** |
222 | * pci_remove_rom - disable the ROM and remove its sysfs attribute | 225 | * pci_remove_rom - disable the ROM and remove its sysfs attribute |
223 | * @pdev: pointer to pci device struct | 226 | * @pdev: pointer to pci device struct |
@@ -236,6 +239,7 @@ void pci_remove_rom(struct pci_dev *pdev) | |||
236 | IORESOURCE_ROM_COPY))) | 239 | IORESOURCE_ROM_COPY))) |
237 | pci_disable_rom(pdev); | 240 | pci_disable_rom(pdev); |
238 | } | 241 | } |
242 | #endif /* 0 */ | ||
239 | 243 | ||
240 | /** | 244 | /** |
241 | * pci_cleanup_rom - internal routine for freeing the ROM copy created | 245 | * pci_cleanup_rom - internal routine for freeing the ROM copy created |
@@ -256,6 +260,4 @@ void pci_cleanup_rom(struct pci_dev *pdev) | |||
256 | } | 260 | } |
257 | 261 | ||
258 | EXPORT_SYMBOL(pci_map_rom); | 262 | EXPORT_SYMBOL(pci_map_rom); |
259 | EXPORT_SYMBOL(pci_map_rom_copy); | ||
260 | EXPORT_SYMBOL(pci_unmap_rom); | 263 | EXPORT_SYMBOL(pci_unmap_rom); |
261 | EXPORT_SYMBOL(pci_remove_rom); | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 169899b5c55..d2cae79f3be 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -580,9 +580,7 @@ int pci_select_bars(struct pci_dev *dev, unsigned long flags); | |||
580 | 580 | ||
581 | /* ROM control related routines */ | 581 | /* ROM control related routines */ |
582 | void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); | 582 | void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size); |
583 | void __iomem __must_check *pci_map_rom_copy(struct pci_dev *pdev, size_t *size); | ||
584 | void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); | 583 | void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom); |
585 | void pci_remove_rom(struct pci_dev *pdev); | ||
586 | size_t pci_get_rom_size(void __iomem *rom, size_t size); | 584 | size_t pci_get_rom_size(void __iomem *rom, size_t size); |
587 | 585 | ||
588 | /* Power management related routines */ | 586 | /* Power management related routines */ |