Merge branch 'linux-2.6' into for-2.6.22

[sfrench/cifs-2.6.git] / arch / powerpc / kernel / of_platform.c

diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index b3189d0161b8d7b4f9a60ac0db8c1804a55584a9..908ed7926db4e60ee3e3a4c2d3459b165ebbbc3c 100644 (file)
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -50,6 +50,7 @@ static struct of_device_id of_default_bus_ids[] = {
        { .type = "plb5", },
        { .type = "plb4", },
        { .type = "opb", },
+       { .type = "ebc", },
        {},
 };
 
@@ -132,6 +133,7 @@ static int of_platform_device_resume(struct device * dev)
 struct bus_type of_platform_bus_type = {
        .name   = "of_platform",
        .match  = of_platform_bus_match,
+       .uevent = of_device_uevent,
        .probe  = of_platform_device_probe,
        .remove = of_platform_device_remove,
        .suspend        = of_platform_device_suspend,
@@ -169,14 +171,14 @@ static void of_platform_make_bus_id(struct of_device *dev)
        char *name = dev->dev.bus_id;
        const u32 *reg;
        u64 addr;
-       long magic;
+       int magic;
 
        /*
         * If it's a DCR based device, use 'd' for native DCRs
         * and 'D' for MMIO DCRs.
         */
 #ifdef CONFIG_PPC_DCR
-       reg = get_property(node, "dcr-reg", NULL);
+       reg = of_get_property(node, "dcr-reg", NULL);
        if (reg) {
 #ifdef CONFIG_PPC_DCR_NATIVE
                snprintf(name, BUS_ID_SIZE, "d%x.%s",
@@ -196,7 +198,7 @@ static void of_platform_make_bus_id(struct of_device *dev)
        /*
         * For MMIO, get the physical address
         */
-       reg = get_property(node, "reg", NULL);
+       reg = of_get_property(node, "reg", NULL);
        if (reg) {
                addr = of_translate_address(node, reg);
                if (addr != OF_BAD_ADDR) {
@@ -474,9 +476,6 @@ static struct of_platform_driver of_pci_phb_driver = {
        .name = "of-pci",
        .match_table = of_pci_phb_ids,
        .probe = of_pci_phb_probe,
-       .driver = {
-              .multithread_probe = 1,
-       },
 };
 
 static __init int of_pci_phb_init(void)