aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/net/ibm_newemac/tah.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-04-25 00:31:07 -0700
committerDavid S. Miller <davem@davemloft.net>2008-04-25 00:31:07 -0700
commitcc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch)
treebdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/ibm_newemac/tah.c
parentxfrm: alg_key_len & alg_icv_len should be unsigned (diff)
parent[netdrvr] tehuti: move ioctl perm check closer to function start (diff)
downloadwireguard-linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.tar.xz
wireguard-linux-cc93d7d77d28d65d4f947dabc95a01c42d713ea3.zip
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ibm_newemac/tah.c')
-rw-r--r--drivers/net/ibm_newemac/tah.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index b023d10d7e1c..30173a9fb557 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -35,7 +35,7 @@ int __devinit tah_attach(struct of_device *ofdev, int channel)
return 0;
}
-void __devexit tah_detach(struct of_device *ofdev, int channel)
+void tah_detach(struct of_device *ofdev, int channel)
{
struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);