* [PATCH] greth: Fix build after OF device conversions.
@ 2010-06-01 7:10 David Miller
2010-06-01 14:46 ` Grant Likely
0 siblings, 1 reply; 2+ messages in thread
From: David Miller @ 2010-06-01 7:10 UTC (permalink / raw)
To: grant.likely; +Cc: netdev
Signed-off-by: David S. Miller <davem@davemloft.net>
---
I've pushed this to net-2.6
drivers/net/greth.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index f37a4c1..3a029d0 100644
--- a/drivers/net/greth.c
+++ b/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)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] greth: Fix build after OF device conversions.
2010-06-01 7:10 [PATCH] greth: Fix build after OF device conversions David Miller
@ 2010-06-01 14:46 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2010-06-01 14:46 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Tue, Jun 1, 2010 at 1:10 AM, David Miller <davem@davemloft.net> wrote:
>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> ---
>
> I've pushed this to net-2.6
Thanks David.
g.
>
> drivers/net/greth.c | 11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/greth.c b/drivers/net/greth.c
> index f37a4c1..3a029d0 100644
> --- a/drivers/net/greth.c
> +++ b/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)
> --
> 1.7.0.4
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-01 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-01 7:10 [PATCH] greth: Fix build after OF device conversions David Miller
2010-06-01 14:46 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox