cxgb3: link fault fixes

[safe/jmp/linux-2.6] / drivers / video / hitfb.c

diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 3dc4942..e6467cf 100644 (file)
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -13,7 +13,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
@@ -28,7 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/hd64461.h>
-#include <asm/cpu/dac.h>
+#include <cpu/dac.h>
 
 #define        WIDTH 640
 
@@ -404,7 +403,7 @@ static int __init hitfb_probe(struct platform_device *dev)
        return 0;
 }
 
-static int __devexit hitfb_remove(struct platform_device *dev)
+static int __exit hitfb_remove(struct platform_device *dev)
 {
        return unregister_framebuffer(&fb_info);
 }
@@ -440,7 +439,7 @@ static int hitfb_resume(struct platform_device *dev)
 
 static struct platform_driver hitfb_driver = {
        .probe          = hitfb_probe,
-       .remove         = __devexit_p(hitfb_remove),
+       .remove         = __exit_p(hitfb_remove),
 #ifdef CONFIG_PM
        .suspend        = hitfb_suspend,
        .resume         = hitfb_resume,