intel-iommu: Fix boot inside 64bit virtualbox with io-apic disabled

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

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index a1f2e7c..a15b44e 100644 (file)
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1513,7 +1513,6 @@ register_framebuffer(struct fb_info *fb_info)
                                       fb_info->fix.id,
                                       registered_fb[i]->fix.id);
                                unregister_framebuffer(registered_fb[i]);
-                               break;
                        }
                }
        }
@@ -1800,7 +1799,7 @@ static int __init video_setup(char *options)
                global = 1;
        }
 
-       if (!global && !strstr(options, "fb:")) {
+       if (!global && !strchr(options, ':')) {
                fb_mode_option = options;
                global = 1;
        }