Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6-omap-h63xx.git] / drivers / video / hitfb.c

diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c
index 756c0ce85911fa8d5c27b6a2254d52cac6323488..e6467cf9f19f17ff4269168755d2ee5bd9ea5ec3 100644 (file)
--- a/drivers/video/hitfb.c
+++ b/drivers/video/hitfb.c
@@ -27,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
 
@@ -403,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);
 }
@@ -439,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,