diff options
author | Christian Merkle <mail@christian-merkle.de> | 2006-08-21 20:07:01 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2006-08-21 20:07:01 -0400 |
commit | d463d34e7b336ae3645ac331adccb578ae5a4285 (patch) | |
tree | 89e777da0c000e1a79cf7a341fd37a1414a09207 | |
parent | 7627899b11ece118b46fbf652e944f9a239f6cd1 (diff) |
intelfb: update doc and Kconfig (supported devices)
According to drivers/video/intelfb/intelfb.h, the intelfb driver
supportes the following devices:
830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM. So the description in
drivers/video/Kconfig and the documentation in
Documentation/fb/intelfb.txt is outdated.
airlied: cleaned up some other obvious mistakes in intelfb.txt.
Signed-off-by: Christian Merkle <mail@christian-merkle.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
-rw-r--r-- | Documentation/fb/intelfb.txt | 11 | ||||
-rw-r--r-- | drivers/video/Kconfig | 6 |
2 files changed, 11 insertions, 6 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 @@ | |||
1 | Intel 830M/845G/852GM/855GM/865G/915G Framebuffer driver | 1 | Intel 830M/845G/852GM/855GM/865G/915G/945G Framebuffer driver |
2 | ================================================================ | 2 | ================================================================ |
3 | 3 | ||
4 | A. Introduction | 4 | A. Introduction |
5 | This is a framebuffer driver for various Intel 810/815 compatible | 5 | This is a framebuffer driver for various Intel 8xx/9xx compatible |
6 | graphics devices. These would include: | 6 | graphics devices. These would include: |
7 | 7 | ||
8 | Intel 830M | 8 | Intel 830M |
9 | Intel 810E845G | 9 | Intel 845G |
10 | Intel 852GM | 10 | Intel 852GM |
11 | Intel 855GM | 11 | Intel 855GM |
12 | Intel 865G | 12 | Intel 865G |
13 | Intel 915G | 13 | Intel 915G |
14 | Intel 915GM | ||
15 | Intel 945G | ||
16 | Intel 945GM | ||
14 | 17 | ||
15 | B. List of available options | 18 | B. List of available options |
16 | 19 | ||
@@ -78,7 +81,7 @@ C. Kernel booting | |||
78 | Separate each option/option-pair by commas (,) and the option from its value | 81 | Separate each option/option-pair by commas (,) and the option from its value |
79 | with an equals sign (=) as in the following: | 82 | with an equals sign (=) as in the following: |
80 | 83 | ||
81 | video=i810fb:option1,option2=value2 | 84 | video=intelfb:option1,option2=value2 |
82 | 85 | ||
83 | Sample Usage | 86 | Sample Usage |
84 | ------------ | 87 | ------------ |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 743c853ad150..60c6773eaac4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -805,7 +805,7 @@ config FB_I810_I2C | |||
805 | help | 805 | help |
806 | 806 | ||
807 | config FB_INTEL | 807 | config FB_INTEL |
808 | tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)" | 808 | tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G support (EXPERIMENTAL)" |
809 | depends on FB && EXPERIMENTAL && PCI && X86 | 809 | depends on FB && EXPERIMENTAL && PCI && X86 |
810 | select AGP | 810 | select AGP |
811 | select AGP_INTEL | 811 | select AGP_INTEL |
@@ -817,7 +817,7 @@ config FB_INTEL | |||
817 | select FB_CFB_IMAGEBLIT | 817 | select FB_CFB_IMAGEBLIT |
818 | help | 818 | help |
819 | This driver supports the on-board graphics built in to the Intel | 819 | This driver supports the on-board graphics built in to the Intel |
820 | 830M/845G/852GM/855GM/865G chipsets. | 820 | 830M/845G/852GM/855GM/865G/915G/915GM/945G/945GM chipsets. |
821 | Say Y if you have and plan to use such a board. | 821 | Say Y if you have and plan to use such a board. |
822 | 822 | ||
823 | If you say Y here and want DDC/I2C support you must first say Y to | 823 | If you say Y here and want DDC/I2C support you must first say Y to |
@@ -830,6 +830,8 @@ config FB_INTEL | |||
830 | To compile this driver as a module, choose M here: the | 830 | To compile this driver as a module, choose M here: the |
831 | module will be called intelfb. | 831 | module will be called intelfb. |
832 | 832 | ||
833 | For more information, please read <file:Documentation/fb/intelfb.txt> | ||
834 | |||
833 | config FB_INTEL_DEBUG | 835 | config FB_INTEL_DEBUG |
834 | bool "Intel driver Debug Messages" | 836 | bool "Intel driver Debug Messages" |
835 | depends on FB_INTEL | 837 | depends on FB_INTEL |