projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
[profile/ivi/kernel-x86-ivi.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
pci_dlpar.c
diff --git
a/arch/powerpc/platforms/pseries/pci_dlpar.c
b/arch/powerpc/platforms/pseries/pci_dlpar.c
index
261a577
..
c91b22b
100644
(file)
--- a/
arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/
arch/powerpc/platforms/pseries/pci_dlpar.c
@@
-149,7
+149,7
@@
void pcibios_add_pci_devices(struct pci_bus * bus)
}
EXPORT_SYMBOL_GPL(pcibios_add_pci_devices);
-struct pci_controller *
__devinit
init_phb_dynamic(struct device_node *dn)
+struct pci_controller *init_phb_dynamic(struct device_node *dn)
{
struct pci_controller *phb;