diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 12:14:10 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-18 12:14:10 -0600 |
| commit | e822a007047fb84cd068bfa35a682015e0fe19b9 (patch) | |
| tree | b66b7b149eebbab4db862a0c75eb0c3b25d76493 /arch/sh | |
| parent | 47fcb6da65e9e74f71f4ec68f1245fc600bec711 (diff) | |
| parent | bb15d8db7cce766b62cab624120916d25e94ac7a (diff) | |
| download | linux-e822a007047fb84cd068bfa35a682015e0fe19b9.tar.gz linux-e822a007047fb84cd068bfa35a682015e0fe19b9.tar.bz2 linux-e822a007047fb84cd068bfa35a682015e0fe19b9.zip | |
Merge branch 'topic/sebastian-devinit-fixups' into next
* topic/sebastian-devinit-fixups:
scripts/modpost: check for bad references in .pci.fixups area
sh/PCI: move fixup hooks from __init to __devinit
powerpc/PCI: move fixup hooks from __init to __devinit
frv/PCI: move fixup hooks from __init to __devinit
arm/PCI: move fixup hooks from __init to __devinit
alpha/PCI: move fixup hooks from __init to __devinit
PCI: move fixup hooks from __init to __devinit
x86/PCI: move fixup hooks from __init to __devinit
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/drivers/pci/fixups-dreamcast.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index edeea8960c30..a5fe1b54c952 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -28,7 +28,7 @@ #include <asm/irq.h> #include <mach/pci.h> -static void __init gapspci_fixup_resources(struct pci_dev *dev) +static void __devinit gapspci_fixup_resources(struct pci_dev *dev) { struct pci_channel *p = dev->sysdata; |