diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-03-17 07:44:08 (GMT) |
| commit | 1d2a1959fe534279cf37aba20b08c24c20840e52 (patch) | |
| tree | 67c0b9aa7fe22a44bf0b4af88947799203eb8f67 /drivers/net/greth.c | |
| parent | 5a79ce76e9bb8f4b2cd8106ee36d15ee05013bcf (diff) | |
| parent | 054cfaacf88865bff1dd58d305443d5d6c068a08 (diff) | |
| download | linux-1d2a1959fe534279cf37aba20b08c24c20840e52.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Diffstat (limited to 'drivers/net/greth.c')
| -rw-r--r-- | drivers/net/greth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index fdb0333..396ff7d 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -1411,7 +1411,7 @@ error: } /* Initialize the GRETH MAC */ -static int __devinit greth_of_probe(struct platform_device *ofdev, const struct of_device_id *match) +static int __devinit greth_of_probe(struct platform_device *ofdev) { struct net_device *dev; struct greth_private *greth; @@ -1646,7 +1646,7 @@ static struct of_device_id greth_of_match[] = { MODULE_DEVICE_TABLE(of, greth_of_match); -static struct of_platform_driver greth_of_driver = { +static struct platform_driver greth_of_driver = { .driver = { .name = "grlib-greth", .owner = THIS_MODULE, @@ -1658,12 +1658,12 @@ static struct of_platform_driver greth_of_driver = { static int __init greth_init(void) { - return of_register_platform_driver(&greth_of_driver); + return platform_driver_register(&greth_of_driver); } static void __exit greth_cleanup(void) { - of_unregister_platform_driver(&greth_of_driver); + platform_driver_unregister(&greth_of_driver); } module_init(greth_init); |