git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
p3060_qds.c
diff --git
a/arch/powerpc/platforms/85xx/p3060_qds.c
b/arch/powerpc/platforms/85xx/p3060_qds.c
index
01dcf44
..
081cf4a
100644
(file)
--- 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,
};
.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);
#ifdef CONFIG_SWIOTLB
machine_arch_initcall(p3060_qds, swiotlb_setup_bus_notifier);