aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/44x/katmai.c
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 11:42:02 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-24 11:42:02 -0500
commit3f8c5c3b4d07fa24e7081a54798ddfab7360a102 (patch)
tree3bcd0754918c06ed8d532b09f1135a1b7316691c /arch/powerpc/platforms/44x/katmai.c
parent9e0fd5f06cbdb3bb47ce54bdbfa43257e6b2b789 (diff)
[POWERPC] 4xx: Use machine_device_initcall for bus probe
Some machine_xx_initcall macros were recently added that check for the machine type before calling the function. This converts the 4xx platforms to use those for bus probing. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/platforms/44x/katmai.c')
-rw-r--r--arch/powerpc/platforms/44x/katmai.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c
index 06aa0aa3cf0e..11134121f272 100644
--- a/arch/powerpc/platforms/44x/katmai.c
+++ b/arch/powerpc/platforms/44x/katmai.c
@@ -34,14 +34,11 @@ static __initdata struct of_device_id katmai_of_bus[] = {
34 34
35static int __init katmai_device_probe(void) 35static int __init katmai_device_probe(void)
36{ 36{
37 if (!machine_is(katmai))
38 return 0;
39
40 of_platform_bus_probe(NULL, katmai_of_bus, NULL); 37 of_platform_bus_probe(NULL, katmai_of_bus, NULL);
41 38
42 return 0; 39 return 0;
43} 40}
44device_initcall(katmai_device_probe); 41machine_device_initcall(katmai, katmai_device_probe);
45 42
46static int __init katmai_probe(void) 43static int __init katmai_probe(void)
47{ 44{