diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:12:41 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-03 17:12:41 -0500 |
| commit | f41bf2ab998daaa2ac27348d5813e0ae21c57ded (patch) | |
| tree | 0ad5ca31ec88b84c4ba1f6380bd971d9933f33e5 /drivers/video | |
| parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) | |
| parent | bdf602bd737eb07d63d6fa2da826b4751fdf9bab (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] fix lots of ARM __devexit sillyness
[ARM] 5417/1: Set the correct cacheid for ARMv6 CPUs with ARMv7 style MMU
[ARM] 5416/1: Use unused address in v6_early_abort
[ARM] 5411/1: S3C64XX: Fix EINT unmask
[ARM] at91: fix for Atmel AT91 powersaving
[ARM] RiscPC: Fix etherh oops
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 = { |