Merge git://git.infradead.org/~dwmw2/mtd-2.6.35

[pandora-kernel.git] / arch / sparc / kernel / central.c

diff --git a/arch/sparc/kernel/central.c b/arch/sparc/kernel/central.c
index 415c86d..434335f 100644 (file)
--- a/arch/sparc/kernel/central.c
+++ b/arch/sparc/kernel/central.c
@@ -149,10 +149,11 @@ static struct of_device_id __initdata clock_board_match[] = {
 };
 
 static struct of_platform_driver clock_board_driver = {
-       .match_table    = clock_board_match,
        .probe          = clock_board_probe,
-       .driver         = {
-               .name   = "clock_board",
+       .driver = {
+               .name = "clock_board",
+               .owner = THIS_MODULE,
+               .of_match_table = clock_board_match,
        },
 };
 
@@ -168,7 +169,7 @@ static int __devinit fhc_probe(struct of_device *op,
                goto out;
        }
 
-       if (!strcmp(op->node->parent->name, "central"))
+       if (!strcmp(op->dev.of_node->parent->name, "central"))
                p->central = true;
 
        p->pregs = of_ioremap(&op->resource[0], 0,
@@ -183,7 +184,7 @@ static int __devinit fhc_probe(struct of_device *op,
                reg = upa_readl(p->pregs + FHC_PREGS_BSR);
                p->board_num = ((reg >> 16) & 1) | ((reg >> 12) & 0x0e);
        } else {
-               p->board_num = of_getintprop_default(op->node, "board#", -1);
+               p->board_num = of_getintprop_default(op->dev.of_node, "board#", -1);
                if (p->board_num == -1) {
                        printk(KERN_ERR "fhc: No board# property\n");
                        goto out_unmap_pregs;
@@ -254,10 +255,11 @@ static struct of_device_id __initdata fhc_match[] = {
 };
 
 static struct of_platform_driver fhc_driver = {
-       .match_table    = fhc_match,
        .probe          = fhc_probe,
-       .driver         = {
-               .name   = "fhc",
+       .driver = {
+               .name = "fhc",
+               .owner = THIS_MODULE,
+               .of_match_table = fhc_match,
        },
 };