git.samba.org
/
sfrench
/
cifs-2.6.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://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
p5020_ds.c
diff --git
a/arch/powerpc/platforms/85xx/p5020_ds.c
b/arch/powerpc/platforms/85xx/p5020_ds.c
index 17bef15a85eda1cdce2a8acbc4353047c12c8d39..753a42c29d4dfd75f8fe640b80d4f368e7648cb0 100644
(file)
--- a/
arch/powerpc/platforms/85xx/p5020_ds.c
+++ b/
arch/powerpc/platforms/85xx/p5020_ds.c
@@
-91,7
+91,7
@@
define_machine(p5020_ds) {
#endif
};
-machine_
device
_initcall(p5020_ds, corenet_ds_publish_devices);
+machine_
arch
_initcall(p5020_ds, corenet_ds_publish_devices);
#ifdef CONFIG_SWIOTLB
machine_arch_initcall(p5020_ds, swiotlb_setup_bus_notifier);