From 6045469d4b1115de347694db29aa1a4ac64eb9db Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:19:58 -0500 Subject: [PATCH] --- yaml --- r: 337001 b: refs/heads/master c: 4dde2d2f3a3b09d282eb399d24fb261ae50425ef h: refs/heads/master i: 336999: e829cd53215451739819f68b608b5c46d513fd4c v: v3 --- [refs] | 2 +- trunk/drivers/char/sonypi.c | 2 +- trunk/drivers/char/tb0219.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6ff74c3129bf..4d92e17c0e2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 486a5c28c2e7d6a80c393ac7d612b77d80447b84 +refs/heads/master: 4dde2d2f3a3b09d282eb399d24fb261ae50425ef diff --git a/trunk/drivers/char/sonypi.c b/trunk/drivers/char/sonypi.c index 9b4f0116ff21..34f0db34fcd3 100644 --- a/trunk/drivers/char/sonypi.c +++ b/trunk/drivers/char/sonypi.c @@ -1491,7 +1491,7 @@ static struct platform_driver sonypi_driver = { .pm = SONYPI_PM, }, .probe = sonypi_probe, - .remove = __devexit_p(sonypi_remove), + .remove = sonypi_remove, .shutdown = sonypi_shutdown, }; diff --git a/trunk/drivers/char/tb0219.c b/trunk/drivers/char/tb0219.c index ad264185eb10..6bfe2af844eb 100644 --- a/trunk/drivers/char/tb0219.c +++ b/trunk/drivers/char/tb0219.c @@ -334,7 +334,7 @@ static struct platform_device *tb0219_platform_device; static struct platform_driver tb0219_device_driver = { .probe = tb0219_probe, - .remove = __devexit_p(tb0219_remove), + .remove = tb0219_remove, .driver = { .name = "TB0219", .owner = THIS_MODULE,