Pull sony into release branch

[linux-2.6] / include / linux / io.h

diff --git a/include/linux/io.h b/include/linux/io.h
index 45a9c944cb0ad2b2e49a9d7ba8a389693631e840..c244a0cc9319bc37dfaee08d2c385b638dcbc990 100644 (file)
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -22,6 +22,8 @@
 #include <asm/io.h>
 #include <asm/page.h>
 
+struct device;
+
 void __iowrite32_copy(void __iomem *to, const void *from, size_t count);
 void __iowrite64_copy(void __iomem *to, const void *from, size_t count);
 
@@ -41,12 +43,6 @@ void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset,
                                    unsigned long size);
 void devm_iounmap(struct device *dev, void __iomem *addr);
 
-void __iomem * pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen);
-void pcim_iounmap(struct pci_dev *pdev, void __iomem *addr);
-void __iomem * const * pcim_iomap_table(struct pci_dev *pdev);
-
-int pcim_iomap_regions(struct pci_dev *pdev, u16 mask, const char *name);
-
 /**
  *     check_signature         -       find BIOS signatures
  *     @io_addr: mmio address to check