diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 03:37:55 -0400 |
| commit | 577f99c1d08cf9cbdafd4e858dd13ff04d855090 (patch) | |
| tree | 0f726bbda9b18d311d4c95198bbd96cb7ac01db0 /drivers/video/hitfb.c | |
| parent | 26c0f03f6b77c513cb7bc37b73a06819bdbb791b (diff) | |
| parent | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/rt2x00dev.c
net/8021q/vlan_dev.c
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 756c0ce85911..392a8be6aa76 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, |