---

yaml --- r: 155875 b: refs/heads/master c: 78a9c9c h: refs/heads/master i: 155873: 12f3523 155871: 3193a96 v: v3
git-mirror · Jul 22, 2009 · 35a0398 · 35a0398
1 parent 1adbf54
commit 35a0398
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b55a4a3f761db7daba1ac526ef60f64f5c53689
+refs/heads/master: 78a9c9c97455d0f8d2d2098b2252eb4bf65be799
diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c
@@ -1228,7 +1228,6 @@ static int at91ether_resume(struct platform_device *pdev)
 #endif
 
 static struct platform_driver at91ether_driver = {
-	.probe		= at91ether_probe,
 	.remove		= __devexit_p(at91ether_remove),
 	.suspend	= at91ether_suspend,
 	.resume		= at91ether_resume,
@@ -1240,7 +1239,7 @@ static struct platform_driver at91ether_driver = {
 
 static int __init at91ether_init(void)
 {
-	return platform_driver_register(&at91ether_driver);
+	return platform_driver_probe(&at91ether_driver, at91ether_probe);
 }
 
 static void __exit at91ether_exit(void)