diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 10:31:28 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 10:31:28 +0200 |
| commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
| tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /arch/sparc/kernel/pcic.c | |
| parent | [MTD] [MAPS] fix plat-ram printk format (diff) | |
| parent | Linux 2.6.21 (diff) | |
| download | linux-ef2e58ea6b9931c3a4816c66593da49bb20e3b24.tar.xz linux-ef2e58ea6b9931c3a4816c66593da49bb20e3b24.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index 3fa5f95c4614..1c927c538b8b 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c @@ -601,7 +601,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node) /* * Normally called from {do_}pci_scan_bus... */ -void __init pcibios_fixup_bus(struct pci_bus *bus) +void __devinit pcibios_fixup_bus(struct pci_bus *bus) { struct pci_dev *dev; int i, has_io, has_mem; @@ -842,7 +842,7 @@ static void watchdog_reset() { /* * Other archs parse arguments here. */ -char * __init pcibios_setup(char *str) +char * __devinit pcibios_setup(char *str) { return str; } |