- Update to 3.3-rc2.

[linux-flexiantxendom0-3.2.10.git] / arch / powerpc / kernel / prom_init.c

diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index eca626e..e1f46f5 100644 (file)
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -172,6 +172,7 @@ static unsigned long __initdata dt_string_start, dt_string_end;
 
 static unsigned long __initdata prom_initrd_start, prom_initrd_end;
 
+static int __initdata prom_no_display;
 #ifdef CONFIG_PPC64
 static int __initdata prom_iommu_force_on;
 static int __initdata prom_iommu_off;
@@ -624,6 +625,14 @@ static void __init early_cmdline_parse(void)
 #endif /* CONFIG_CMDLINE */
        prom_printf("command line: %s\n", RELOC(prom_cmd_line));
 
+       opt = strstr(RELOC(prom_cmd_line), RELOC("prom="));
+       if (opt) {
+               opt += 5;
+               while (*opt && *opt == ' ')
+                       opt++;
+               if (!strncmp(opt, RELOC("nodisplay"), 9))
+                       RELOC(prom_no_display) = 1;
+       }
 #ifdef CONFIG_PPC64
        opt = strstr(RELOC(prom_cmd_line), RELOC("iommu="));
        if (opt) {
@@ -2889,6 +2898,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
        /* 
         * Initialize display devices
         */
+       if (RELOC(prom_no_display) == 0)
        prom_check_displays();
 
 #ifdef CONFIG_PPC64