diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-25 03:31:07 -0400 |
| commit | cc93d7d77d28d65d4f947dabc95a01c42d713ea3 (patch) | |
| tree | bdaa01a54c7d881b7087551daf85fa52c61b3d1c /drivers/net/ibm_newemac/tah.c | |
| parent | 461e6c856faf9cdd8862fa4d0785974a64e39dba (diff) | |
| parent | f946dffed6334f08da065a89ed65026ebf8b33b4 (diff) | |
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.c | 2 |
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) | |||
| 35 | return 0; | 35 | return 0; |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | void __devexit tah_detach(struct of_device *ofdev, int channel) | 38 | void tah_detach(struct of_device *ofdev, int channel) |
| 39 | { | 39 | { |
| 40 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); | 40 | struct tah_instance *dev = dev_get_drvdata(&ofdev->dev); |
| 41 | 41 | ||