diff options
| author |   Chris Metcalf <cmetcalf@tilera.com> | 2012-04-25 12:45:26 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2012-04-25 12:45:26 -0400 |
| commit | 05ef1b79d46347f94d9a78214cc745046c03e45a (patch) | |
| tree | 4e073d0958c86a1d1292c0563f706d5ee6091863 /arch/tile | |
| parent | init: fix bug where environment vars can't be passed via boot args (diff) | |
| download | linux-dev-05ef1b79d46347f94d9a78214cc745046c03e45a.tar.xz linux-dev-05ef1b79d46347f94d9a78214cc745046c03e45a.zip | |
arch/tile: fix a couple of functions that should be __init
They were marked __devinit by mistake, causing some warnings at link time.
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch/tile')
| -rw-r--r-- | arch/tile/include/asm/pci.h | 4 | ||||
| -rw-r--r-- | arch/tile/kernel/pci.c | 4 |
2 files changed, 4 insertions, 4 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) {} diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index a1bb59eecc18..b56d12bf5900 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -141,7 +141,7 @@ static int __devinit tile_init_irqs(int controller_id, * * Returns the number of controllers discovered. */ -int __devinit tile_pci_init(void) +int __init tile_pci_init(void) { int i; @@ -287,7 +287,7 @@ static void __devinit fixup_read_and_payload_sizes(void) * The controllers have been set up by the time we get here, by a call to * tile_pci_init. */ -int __devinit pcibios_init(void) +int __init pcibios_init(void) { int i; |