Merge commit 'origin/master'

Manually fixed up:

	drivers/net/fs_enet/fs_enet-main.c

3 files changed, 10 insertions, 1 deletions

diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index 05a328c11a8b..45c154ade9ca 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2383,6 +2383,9 @@ default_chipset:
                 goto amifb_error;
         }
 
+        fb_videomode_to_modelist(ami_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         round_down_bpp = 0;
         chipptr = chipalloc(fb_info.fix.smem_len+
                             SPRITEMEMSIZE+
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c
index dff35474b854..fa55d356b535 100644
--- a/drivers/video/atafb.c
+++ b/drivers/video/atafb.c
@@ -3110,7 +3110,7 @@ int __init atafb_init(void)
         printk("atafb_init: start\n");
 
         if (!MACH_IS_ATARI)
-                return -ENXIO;
+                return -ENODEV;
 
         do {
 #ifdef ATAFB_EXT
@@ -3230,6 +3230,9 @@ int __init atafb_init(void)
                 return -EINVAL;
         }
 
+        fb_videomode_to_modelist(atafb_modedb, NUM_TOTAL_MODES,
+                                 &fb_info.modelist);
+
         atafb_set_disp(&fb_info);
 
         fb_alloc_cmap(&(fb_info.cmap), 1 << fb_info.var.bits_per_pixel, 0);
diff --git a/drivers/video/c2p.c b/drivers/video/c2p.c
index 5c30bbd33054..376bc07ff952 100644
--- a/drivers/video/c2p.c
+++ b/drivers/video/c2p.c
@@ -12,6 +12,7 @@
  *  for more details.
  */
 
+#include <linux/module.h>
 #include <linux/string.h>
 #include "c2p.h"
 
@@ -226,4 +227,6 @@ void c2p(u8 *dst, const u8 *src, u32 dx, u32 dy, u32 width, u32 height,
         dst += dst_nextline;
     }
 }
+EXPORT_SYMBOL_GPL(c2p);
 
+MODULE_LICENSE("GPL");