1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 2e59fe947d28..f94d8281cfb0 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -185,7 +185,7 @@ static int __devinit electra_cf_probe(struct of_device *ofdev,
                                       const struct of_device_id *match)
 {
         struct device *device = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct electra_cf_socket   *cf;
         struct resource mem, io;
         int status;
@@ -357,8 +357,11 @@ static const struct of_device_id electra_cf_match[] = {
 MODULE_DEVICE_TABLE(of, electra_cf_match);
 
 static struct of_platform_driver electra_cf_driver = {
-        .name      = (char *)driver_name,
-        .match_table    = electra_cf_match,
+        .driver = {
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = electra_cf_match,
+        },
         .probe    = electra_cf_probe,
         .remove   = electra_cf_remove,
 };