diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:47:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-06 05:47:52 -0500 |
| commit | 7fc07d84108d54c5b94625c0e168f31b2d66976e (patch) | |
| tree | bebcbcae186108a815de0c1b90e25b1a5fa3852c /drivers/video | |
| parent | b67802ea8061393f7bd2d4db934646e76096027c (diff) | |
| parent | 8a0be9ef8225638d26b455788f988c8f84ce9e75 (diff) | |
Merge branch 'sched/core' into sched/cleanups
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/pxafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 48ff701d3a72..2552b9f325ee 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -2230,7 +2230,7 @@ static int __devexit pxafb_remove(struct platform_device *dev) | |||
| 2230 | 2230 | ||
| 2231 | static struct platform_driver pxafb_driver = { | 2231 | static struct platform_driver pxafb_driver = { |
| 2232 | .probe = pxafb_probe, | 2232 | .probe = pxafb_probe, |
| 2233 | .remove = pxafb_remove, | 2233 | .remove = __devexit_p(pxafb_remove), |
| 2234 | .suspend = pxafb_suspend, | 2234 | .suspend = pxafb_suspend, |
| 2235 | .resume = pxafb_resume, | 2235 | .resume = pxafb_resume, |
| 2236 | .driver = { | 2236 | .driver = { |