diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-05-10 02:32:01 +0200 |
| commit | 3aa450c063e29b4f4b622480e1779e5e256d8f8f (patch) | |
| tree | d18942ff8bf862f2973f4e7adbf99c4f3e22a563 /arch/tile/include | |
| parent | spi/devicetree: Move devicetree support code into spi directory (diff) | |
| parent | Linux 3.4-rc6 (diff) | |
| download | linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.tar.xz linux-3aa450c063e29b4f4b622480e1779e5e256d8f8f.zip | |
Merge tag 'v3.4-rc6' into spi/next
Linux 3.4-rc6
Diffstat (limited to 'arch/tile/include')
| -rw-r--r-- | arch/tile/include/asm/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h index 5d5a635530bd..32e6cbe8dff3 100644 --- a/arch/tile/include/asm/pci.h +++ b/arch/tile/include/asm/pci.h @@ -47,8 +47,8 @@ struct pci_controller { */ #define PCI_DMA_BUS_IS_PHYS 1 -int __devinit tile_pci_init(void); -int __devinit pcibios_init(void); +int __init tile_pci_init(void); +int __init pcibios_init(void); static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} |