diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 00:43:32 -0400 |
commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /drivers/video/Kconfig | |
parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) |
Merge from Linus' tree
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 773ae11b4a19..1cd942abb580 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -768,6 +768,7 @@ config FB_INTEL | |||
768 | select FB_CFB_FILLRECT | 768 | select FB_CFB_FILLRECT |
769 | select FB_CFB_COPYAREA | 769 | select FB_CFB_COPYAREA |
770 | select FB_CFB_IMAGEBLIT | 770 | select FB_CFB_IMAGEBLIT |
771 | select FB_SOFT_CURSOR | ||
771 | help | 772 | help |
772 | This driver supports the on-board graphics built in to the Intel | 773 | This driver supports the on-board graphics built in to the Intel |
773 | 830M/845G/852GM/855GM/865G chipsets. | 774 | 830M/845G/852GM/855GM/865G chipsets. |