diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 09:43:04 +0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-25 09:43:04 +0400 |
commit | 314820c9e892d8f41ba4db300ec96770d9c8294b (patch) | |
tree | 3d5c59a429239b180c77e57f998a78d3f2b79827 /drivers/video/broadsheetfb.c | |
parent | e76b8ee25e034ab601b525abb95cea14aa167ed3 (diff) | |
parent | 07b8481d4aff73d6f451f25e74ea10240ff5131e (diff) | |
download | linux-314820c9e892d8f41ba4db300ec96770d9c8294b.tar.xz |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/video/broadsheetfb.c')
-rw-r--r-- | drivers/video/broadsheetfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/broadsheetfb.c b/drivers/video/broadsheetfb.c index 377dde3d5bfc..c95b417d0d41 100644 --- a/drivers/video/broadsheetfb.c +++ b/drivers/video/broadsheetfb.c @@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev) static struct platform_driver broadsheetfb_driver = { .probe = broadsheetfb_probe, - .remove = broadsheetfb_remove, + .remove = __devexit_p(broadsheetfb_remove), .driver = { .owner = THIS_MODULE, .name = "broadsheetfb", |