diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-26 02:43:24 -0400 |
| commit | 46b2835771ad8ef19b8e081e8c90439408c7645f (patch) | |
| tree | 4059e1949df40d6c9078bcbe6783b03384ba61f3 /arch/powerpc/kernel/pci-common.c | |
| parent | 9d78592ed72dbff1d8825207f8def07858a49768 (diff) | |
| parent | 141707892e92dca69b7b8af65b9367da2d1f8120 (diff) | |
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) | |||
| 65 | spin_unlock(&hose_spinlock); | 65 | spin_unlock(&hose_spinlock); |
| 66 | } | 66 | } |
| 67 | 67 | ||
| 68 | struct pci_controller * pcibios_alloc_controller(struct device_node *dev) | 68 | __init_refok struct pci_controller * pcibios_alloc_controller(struct device_node *dev) |
| 69 | { | 69 | { |
| 70 | struct pci_controller *phb; | 70 | struct pci_controller *phb; |
| 71 | 71 | ||