Merge branch 'x86/cpufeature' into irq/numa

[sfrench/cifs-2.6.git] / arch / x86 / video / fbdev.c

diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c
index 48fb38d7d2c0ff695a60deedfb0d92139f84c21d..69527688f7940eebc63735a41f3431bdcbf280d6 100644 (file)
--- a/arch/x86/video/fbdev.c
+++ b/arch/x86/video/fbdev.c
@@ -1,6 +1,4 @@
 /*
- * arch/i386/video/fbdev.c - i386 Framebuffer
- *
  * Copyright (C) 2007 Antonino Daplas <adaplas@gmail.com>
  *
  * This file is subject to the terms and conditions of the GNU General Public
@@ -30,3 +28,4 @@ int fb_is_primary_device(struct fb_info *info)
        return retval;
 }
 EXPORT_SYMBOL(fb_is_primary_device);
+MODULE_LICENSE("GPL");