vserver 2.0 rc7

[linux-2.6.git] / drivers / video / vesafb.c

diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index ab2f5c3..3027841 100644 (file)
--- a/drivers/video/vesafb.c
+++ b/drivers/video/vesafb.c
@@ -19,9 +19,6 @@
 #include <linux/fb.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
-#ifdef __i386__
-#include <video/edid.h>
-#endif
 #include <asm/io.h>
 #include <asm/mtrr.h>
 
@@ -185,7 +182,7 @@ static struct fb_ops vesafb_ops = {
        .fb_cursor      = soft_cursor,
 };
 
-int __init vesafb_setup(char *options)
+static int __init vesafb_setup(char *options)
 {
        char *this_opt;
        
@@ -434,7 +431,7 @@ static struct platform_device vesafb_device = {
        .name   = "vesafb",
 };
 
-int __init vesafb_init(void)
+static int __init vesafb_init(void)
 {
        int ret;
        char *option = NULL;
@@ -453,12 +450,4 @@ int __init vesafb_init(void)
 }
 module_init(vesafb_init);
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
-
 MODULE_LICENSE("GPL");