From a3d62deca257f2a5b9be1963aba395f7d8a0c08a Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 21 Mar 2010 16:05:27 +0000 Subject: [atheros] fix ethernet driver remove function to use the correct annotation (#6311) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20350 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch | 4 ++-- target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch | 4 ++-- target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch | 4 ++-- target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch index 5c28ae8b7..fa9eead51 100644 --- a/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.30/110-ar2313_ethernet.patch @@ -355,7 +355,7 @@ + tasklet_kill(&sp->rx_tasklet); +} + -+static int __exit ar231x_remove(struct platform_device *pdev) ++static int __devexit ar231x_remove(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct ar231x_private *sp = netdev_priv(dev); @@ -392,7 +392,7 @@ +static struct platform_driver ar231x_driver = { + .driver.name = "ar231x-eth", + .probe = ar231x_probe, -+ .remove = ar231x_remove, ++ .remove = __devexit_p(ar231x_remove), +}; + +int __init ar231x_module_init(void) diff --git a/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch index e003e6b0d..b47ccc4ba 100644 --- a/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.31/110-ar2313_ethernet.patch @@ -355,7 +355,7 @@ + tasklet_kill(&sp->rx_tasklet); +} + -+static int __exit ar231x_remove(struct platform_device *pdev) ++static int __devexit ar231x_remove(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct ar231x_private *sp = netdev_priv(dev); @@ -392,7 +392,7 @@ +static struct platform_driver ar231x_driver = { + .driver.name = "ar231x-eth", + .probe = ar231x_probe, -+ .remove = ar231x_remove, ++ .remove = __devexit_p(ar231x_remove), +}; + +int __init ar231x_module_init(void) diff --git a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch index 6f511a730..33e4ae332 100644 --- a/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.32/110-ar2313_ethernet.patch @@ -355,7 +355,7 @@ + tasklet_kill(&sp->rx_tasklet); +} + -+static int __exit ar231x_remove(struct platform_device *pdev) ++static int __devexit ar231x_remove(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct ar231x_private *sp = netdev_priv(dev); @@ -392,7 +392,7 @@ +static struct platform_driver ar231x_driver = { + .driver.name = "ar231x-eth", + .probe = ar231x_probe, -+ .remove = ar231x_remove, ++ .remove = __devexit_p(ar231x_remove), +}; + +int __init ar231x_module_init(void) diff --git a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch index f24ee12b7..6ce948efe 100644 --- a/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch +++ b/target/linux/atheros/patches-2.6.33/110-ar2313_ethernet.patch @@ -355,7 +355,7 @@ + tasklet_kill(&sp->rx_tasklet); +} + -+static int __exit ar231x_remove(struct platform_device *pdev) ++static int __devexit ar231x_remove(struct platform_device *pdev) +{ + struct net_device *dev = platform_get_drvdata(pdev); + struct ar231x_private *sp = netdev_priv(dev); @@ -392,7 +392,7 @@ +static struct platform_driver ar231x_driver = { + .driver.name = "ar231x-eth", + .probe = ar231x_probe, -+ .remove = ar231x_remove, ++ .remove = __devexit_p(ar231x_remove), +}; + +int __init ar231x_module_init(void) -- cgit v1.2.3