From 35a03985aef052178ffe1bc9ec981a44ddc4d161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 21 Jul 2009 10:11:39 +0000 Subject: [PATCH] --- yaml --- r: 155875 b: refs/heads/master c: 78a9c9c97455d0f8d2d2098b2252eb4bf65be799 h: refs/heads/master i: 155873: 12f3523590ebcefcf78c70dacce8757bc24111a6 155871: 3193a96ad7df4b383ab4bf5bcadb3cc8eb3ab810 v: v3 --- [refs] | 2 +- trunk/drivers/net/arm/at91_ether.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d93ac88747a0..2dfc6a9e7939 100644 --- 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 index 2e7419a61191..5041d10bae9d 100644 --- 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)