Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 74dddbf..a874189 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1078,9 +1078,15 @@
                        specified address. The serial port must already be
                        setup and configured. Options are not yet supported.
 
+               efifb,[options]
+                       Start an early, unaccelerated console on the EFI
+                       memory mapped framebuffer (if available). On cache
+                       coherent non-x86 systems that use system memory for
+                       the framebuffer, pass the 'ram' option so that it is
+                       mapped with the correct attributes.
+
        earlyprintk=    [X86,SH,ARM,M68k,S390]
                        earlyprintk=vga
-                       earlyprintk=efi
                        earlyprintk=sclp
                        earlyprintk=xen
                        earlyprintk=serial[,ttySn[,baudrate]]