diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-06-02 08:15:10 -0400 |
commit | e4caa8bab3862a7694ab7c6dfede223227ad7fc5 (patch) | |
tree | 9fa537a72f00f6b4f86c2da7be2e9554304a8ec4 /drivers/net/greth.c | |
parent | 9f75c1b12c5ef392ddcea575b13560842c28b1b3 (diff) | |
parent | edb39935c8b19fcd9a8f619d0bc1e9d04594cd2b (diff) |
Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda
Diffstat (limited to 'drivers/net/greth.c')
-rw-r--r-- | 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 f37a4c143ddd..3a029d02c2b4 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c | |||
@@ -1607,14 +1607,13 @@ static struct of_device_id greth_of_match[] = { | |||
1607 | MODULE_DEVICE_TABLE(of, greth_of_match); | 1607 | MODULE_DEVICE_TABLE(of, greth_of_match); |
1608 | 1608 | ||
1609 | static struct of_platform_driver greth_of_driver = { | 1609 | static struct of_platform_driver greth_of_driver = { |
1610 | .name = "grlib-greth", | 1610 | .driver = { |
1611 | .match_table = greth_of_match, | 1611 | .name = "grlib-greth", |
1612 | .owner = THIS_MODULE, | ||
1613 | .of_match_table = greth_of_match, | ||
1614 | }, | ||
1612 | .probe = greth_of_probe, | 1615 | .probe = greth_of_probe, |
1613 | .remove = __devexit_p(greth_of_remove), | 1616 | .remove = __devexit_p(greth_of_remove), |
1614 | .driver = { | ||
1615 | .owner = THIS_MODULE, | ||
1616 | .name = "grlib-greth", | ||
1617 | }, | ||
1618 | }; | 1617 | }; |
1619 | 1618 | ||
1620 | static int __init greth_init(void) | 1619 | static int __init greth_init(void) |