diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-11-25 15:25:39 +1100 |
| commit | 56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch) | |
| tree | fc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/platforms/85xx/p3060_qds.c | |
| parent | e075cd7001634c9984950488d9201fcf896dca27 (diff) | |
| parent | 8e18862d52b8ecd62354dad117aff22391b2c4e5 (diff) | |
| download | blackbird-obmc-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.gz blackbird-obmc-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/platforms/85xx/p3060_qds.c')
| -rw-r--r-- | arch/powerpc/platforms/85xx/p3060_qds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/85xx/p3060_qds.c b/arch/powerpc/platforms/85xx/p3060_qds.c index 01dcf44871e9..081cf4ac1881 100644 --- a/arch/powerpc/platforms/85xx/p3060_qds.c +++ b/arch/powerpc/platforms/85xx/p3060_qds.c @@ -70,7 +70,7 @@ define_machine(p3060_qds) { .power_save = e500_idle, }; -machine_device_initcall(p3060_qds, declare_of_platform_devices); +machine_device_initcall(p3060_qds, corenet_ds_publish_devices); #ifdef CONFIG_SWIOTLB machine_arch_initcall(p3060_qds, swiotlb_setup_bus_notifier); |
