diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 22:32:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 22:32:33 -0500 |
commit | ce4796d1e16cf3761dc2a02b8d588667d05b3078 (patch) | |
tree | 823d7012c6311c96eaf2041cf2b04558abbaec15 /drivers/video/hitfb.c | |
parent | 46fbdf8935544dcde440bd807b50e52ed2ca7f3b (diff) | |
parent | 7b9726a7a0d8c70ea44a5ed23726748de344f223 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up the sh64 build.
sh: Fix up SH7710 VoIP-GW build.
sh: Flag PMB support as EXPERIMENTAL.
sh: Update r7780mp defconfig.
fb: hitfb: Balance probe/remove section annotations.
sh: hp6xx: Fix up hp6xx_apm build failure.
fb: pvr2fb: Fix up remaining section mismatch.
sh: Fix up section mismatches.
sh: hp6xx: Correct APM output.
sh: update se7780 defconfig
sh: replace remaining __FUNCTION__ occurrences
sh: export copy-page() to modules
sh_ksyms_32.c update for gcc 4.3
sh/mm/pg-sh7705.c must #include <linux/fs.h>
Diffstat (limited to 'drivers/video/hitfb.c')
-rw-r--r-- | drivers/video/hitfb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index 756c0ce8591..392a8be6aa7 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
@@ -403,7 +403,7 @@ static int __init hitfb_probe(struct platform_device *dev) | |||
403 | return 0; | 403 | return 0; |
404 | } | 404 | } |
405 | 405 | ||
406 | static int __devexit hitfb_remove(struct platform_device *dev) | 406 | static int __exit hitfb_remove(struct platform_device *dev) |
407 | { | 407 | { |
408 | return unregister_framebuffer(&fb_info); | 408 | return unregister_framebuffer(&fb_info); |
409 | } | 409 | } |
@@ -439,7 +439,7 @@ static int hitfb_resume(struct platform_device *dev) | |||
439 | 439 | ||
440 | static struct platform_driver hitfb_driver = { | 440 | static struct platform_driver hitfb_driver = { |
441 | .probe = hitfb_probe, | 441 | .probe = hitfb_probe, |
442 | .remove = __devexit_p(hitfb_remove), | 442 | .remove = __exit_p(hitfb_remove), |
443 | #ifdef CONFIG_PM | 443 | #ifdef CONFIG_PM |
444 | .suspend = hitfb_suspend, | 444 | .suspend = hitfb_suspend, |
445 | .resume = hitfb_resume, | 445 | .resume = hitfb_resume, |