diff options
Diffstat (limited to 'arch/powerpc/platforms/44x/sequoia.c')
-rw-r--r-- | arch/powerpc/platforms/44x/sequoia.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c index 21a9dd14f297..d279db42c896 100644 --- a/arch/powerpc/platforms/44x/sequoia.c +++ b/arch/powerpc/platforms/44x/sequoia.c | |||
@@ -21,9 +21,11 @@ | |||
21 | #include <asm/udbg.h> | 21 | #include <asm/udbg.h> |
22 | #include <asm/time.h> | 22 | #include <asm/time.h> |
23 | #include <asm/uic.h> | 23 | #include <asm/uic.h> |
24 | #include <asm/pci-bridge.h> | ||
25 | |||
24 | #include "44x.h" | 26 | #include "44x.h" |
25 | 27 | ||
26 | static struct of_device_id sequoia_of_bus[] = { | 28 | static __initdata struct of_device_id sequoia_of_bus[] = { |
27 | { .compatible = "ibm,plb4", }, | 29 | { .compatible = "ibm,plb4", }, |
28 | { .compatible = "ibm,opb", }, | 30 | { .compatible = "ibm,opb", }, |
29 | { .compatible = "ibm,ebc", }, | 31 | { .compatible = "ibm,ebc", }, |
@@ -32,14 +34,11 @@ static struct of_device_id sequoia_of_bus[] = { | |||
32 | 34 | ||
33 | static int __init sequoia_device_probe(void) | 35 | static int __init sequoia_device_probe(void) |
34 | { | 36 | { |
35 | if (!machine_is(sequoia)) | ||
36 | return 0; | ||
37 | |||
38 | of_platform_bus_probe(NULL, sequoia_of_bus, NULL); | 37 | of_platform_bus_probe(NULL, sequoia_of_bus, NULL); |
39 | 38 | ||
40 | return 0; | 39 | return 0; |
41 | } | 40 | } |
42 | device_initcall(sequoia_device_probe); | 41 | machine_device_initcall(sequoia, sequoia_device_probe); |
43 | 42 | ||
44 | static int __init sequoia_probe(void) | 43 | static int __init sequoia_probe(void) |
45 | { | 44 | { |
@@ -48,6 +47,8 @@ static int __init sequoia_probe(void) | |||
48 | if (!of_flat_dt_is_compatible(root, "amcc,sequoia")) | 47 | if (!of_flat_dt_is_compatible(root, "amcc,sequoia")) |
49 | return 0; | 48 | return 0; |
50 | 49 | ||
50 | ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; | ||
51 | |||
51 | return 1; | 52 | return 1; |
52 | } | 53 | } |
53 | 54 | ||