diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 15:27:30 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-01-19 15:27:30 +0000 |
| commit | 210b1847b32951f52d19df229972399e5b987de2 (patch) | |
| tree | be6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /arch/powerpc/kernel/of_platform.c | |
| parent | 93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff) | |
| parent | d01723479e6a6c70c83295f7847477a016d5e14a (diff) | |
| download | linux-3.10-210b1847b32951f52d19df229972399e5b987de2.tar.gz linux-3.10-210b1847b32951f52d19df229972399e5b987de2.tar.bz2 linux-3.10-210b1847b32951f52d19df229972399e5b987de2.zip | |
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'arch/powerpc/kernel/of_platform.c')
| -rw-r--r-- | arch/powerpc/kernel/of_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index 9db8ec07ec9..07c12697d70 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c @@ -37,7 +37,7 @@ * lacking some bits needed here. */ -static int __devinit of_pci_phb_probe(struct platform_device *dev) +static int of_pci_phb_probe(struct platform_device *dev) { struct pci_controller *phb; |