Skip to contentSkip to conversation

greth: Fix build after OF device conversions.

PATCH In review David Miller 2 participants 2 messages Jun 1, 2010

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

David Miller

author maintainer
#0 lore raw

PATCH 1/1 greth: Fix build after OF device conversions.

Signed-off-by David S. Miller <[email protected]>

---

I've pushed this to net-2.6

 drivers/net/greth.c |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/greth.c +5 -6
index f37a4c1..3a029d0 100644
@@ -1607,14 +1607,13 @@ static struct of_device_id greth_of_match[] = {
 MODULE_DEVICE_TABLE(of, greth_of_match);
 
 static struct of_platform_driver greth_of_driver = {
-	.name = "grlib-greth",
-	.match_table = greth_of_match,
+	.driver = {
+		.name = "grlib-greth",
+		.owner = THIS_MODULE,
+		.of_match_table = greth_of_match,
+	},
 	.probe = greth_of_probe,
 	.remove = __devexit_p(greth_of_remove),
-	.driver = {
-		   .owner = THIS_MODULE,
-		   .name = "grlib-greth",
-		   },
 };
 
 static int __init greth_init(void)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 5 lines · David Miller
Signed-off-by David S. Miller <[email protected]>

---

I've pushed this to net-2.6

Thanks David.

g.

Quoted 32 lines

 drivers/net/greth.c |   11 +++++------

 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/net/greth.c +5 -7
index f37a4c1..3a029d0 100644
@@ -1607,14 +1607,13 @@ static struct of_device_id greth_of_match[] = {
  MODULE_DEVICE_TABLE(of, greth_of_match);
 
  static struct of_platform_driver greth_of_driver = {
-       .name = "grlib-greth",
-       .match_table = greth_of_match,
+       .driver = {
+               .name = "grlib-greth",
+               .owner = THIS_MODULE,
+               .of_match_table = greth_of_match,
+       },
        .probe = greth_of_probe,
        .remove = __devexit_p(greth_of_remove),
-       .driver = {
-                  .owner = THIS_MODULE,
-                  .name = "grlib-greth",
-                  },
  };
 
  static int __init greth_init(void)
--

1.7.0.4

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.