diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /drivers/net/meth.c | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/meth.c')
| -rw-r--r-- | drivers/net/meth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/meth.c b/drivers/net/meth.c index 92ceb689b4d4..2af81735386b 100644 --- a/drivers/net/meth.c +++ b/drivers/net/meth.c | |||
| @@ -828,7 +828,7 @@ static int __exit meth_remove(struct platform_device *pdev) | |||
| 828 | 828 | ||
| 829 | static struct platform_driver meth_driver = { | 829 | static struct platform_driver meth_driver = { |
| 830 | .probe = meth_probe, | 830 | .probe = meth_probe, |
| 831 | .remove = __devexit_p(meth_remove), | 831 | .remove = __exit_p(meth_remove), |
| 832 | .driver = { | 832 | .driver = { |
| 833 | .name = "meth", | 833 | .name = "meth", |
| 834 | .owner = THIS_MODULE, | 834 | .owner = THIS_MODULE, |