From 6bed2df7a76e0c8f1cf778b6f6b1780cbd20d671 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 31 May 2010 05:47:32 -0700 Subject: [PATCH] --- yaml --- r: 199468 b: refs/heads/master c: bc284f94f84c3d76e49c6f3df9028c503f9589d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f2c85282448f..1e0592a4747c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64960848abd18d0bcde3f53ffa7ed0b631e6b25d +refs/heads/master: bc284f94f84c3d76e49c6f3df9028c503f9589d9 diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index f37a4c143ddd..3a029d02c2b4 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/drivers/net/greth.c @@ -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)