diff options
| author | Paul Mackerras | 2007-07-26 08:43:24 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2007-07-26 08:43:24 +0200 |
| commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
| tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/kernel/pci-common.c | |
| parent | [POWERPC] spusched: Fix initial timeslice calculation (diff) | |
| parent | [POWERPC] Fix register labels on show_regs() message for 4xx/Book-E (diff) | |
| download | kernel-qcow2-linux-46b2835771ad8ef19b8e081e8c90439408c7645f.tar.gz kernel-qcow2-linux-46b2835771ad8ef19b8e081e8c90439408c7645f.tar.xz kernel-qcow2-linux-46b2835771ad8ef19b8e081e8c90439408c7645f.zip | |
Merge branch 'fixes-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 74a8fd450f67..083cfbdbe0b2 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -65,7 +65,7 @@ static void __devinit pci_setup_pci_controller(struct pci_controller *hose) spin_unlock(&hose_spinlock); } -struct pci_controller * pcibios_alloc_controller(struct device_node *dev) +__init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev) { struct pci_controller *phb; |