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 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
40x
/
walnut.c
diff --git
a/arch/powerpc/platforms/40x/walnut.c
b/arch/powerpc/platforms/40x/walnut.c
index
b8b257e
..
8b691df
100644
(file)
--- a/
arch/powerpc/platforms/40x/walnut.c
+++ b/
arch/powerpc/platforms/40x/walnut.c
@@
-26,6
+26,7
@@
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
#include <asm/time.h>
#include <asm/uic.h>
#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
static __initdata struct of_device_id walnut_of_bus[] = {
{ .compatible = "ibm,plb3", },
static __initdata struct of_device_id walnut_of_bus[] = {
{ .compatible = "ibm,plb3", },
@@
-50,7
+51,7
@@
static int __init walnut_probe(void)
if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
return 0;
if (!of_flat_dt_is_compatible(root, "ibm,walnut"))
return 0;
- p
pc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC
;
+ p
ci_set_flags(PCI_REASSIGN_ALL_RSRC)
;
return 1;
}
return 1;
}
@@
-61,5
+62,6
@@
define_machine(walnut) {
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
.progress = udbg_progress,
.init_IRQ = uic_init_tree,
.get_irq = uic_get_irq,
- .calibrate_decr = generic_calibrate_decr,
+ .restart = ppc4xx_reset_system,
+ .calibrate_decr = generic_calibrate_decr,
};
};