Merge branch 'master' into gfs2

1 files changed, 7 insertions, 4 deletions

diff --git a/Documentation/fb/intelfb.txt b/Documentation/fb/intelfb.txt
index c12d39a23c3d..aa0d322db171 100644
--- a/Documentation/fb/intelfb.txt
+++ b/Documentation/fb/intelfb.txt
@@ -1,16 +1,19 @@
-Intel 830M/845G/852GM/855GM/865G/915G Framebuffer driver
+Intel 830M/845G/852GM/855GM/865G/915G/945G Framebuffer driver
 ================================================================
 
 A. Introduction
-        This is a framebuffer driver for various Intel 810/815 compatible
+        This is a framebuffer driver for various Intel 8xx/9xx compatible
 graphics devices.  These would include:
 
         Intel 830M
-        Intel 810E845G
+        Intel 845G
         Intel 852GM
         Intel 855GM
         Intel 865G
         Intel 915G
+        Intel 915GM
+        Intel 945G
+        Intel 945GM
 
 B.  List of available options
 
@@ -78,7 +81,7 @@ C. Kernel booting
 Separate each option/option-pair by commas (,) and the option from its value
 with an equals sign (=) as in the following:
 
-video=i810fb:option1,option2=value2
+video=intelfb:option1,option2=value2
 
 Sample Usage
 ------------