diff options
author | Randy.Dunlap <rdunlap@xenotime.net> | 2005-11-07 04:00:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:49 -0500 |
commit | e65c0850ae811a53554e1abe71627fba1261cfc7 (patch) | |
tree | 5d9f3193b9c2a6f836a3c6acec004f2fef4feff9 | |
parent | 80d188a643b0f550a2aaedf7bf4dd1abd86cfc45 (diff) |
[PATCH] framebuffer: add some help text in Kconfig
Frame buffer driver help text changes:
- Move S3 Trio next to S3 Savage;
- add or clarify help text for several FB drivers;
- add help text for FB console;
- add help text for bootup logos;
Acked-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/Kconfig | 17 | ||||
-rw-r--r-- | drivers/video/console/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/logo/Kconfig | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7192b770bfb6..564881ff1b2c 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -182,6 +182,9 @@ config FB_CLPS711X | |||
182 | select FB_CFB_COPYAREA | 182 | select FB_CFB_COPYAREA |
183 | select FB_CFB_IMAGEBLIT | 183 | select FB_CFB_IMAGEBLIT |
184 | select FB_SOFT_CURSOR | 184 | select FB_SOFT_CURSOR |
185 | help | ||
186 | Say Y to enable the Framebuffer driver for the CLPS7111 and | ||
187 | EP7212 processors. | ||
185 | 188 | ||
186 | config FB_SA1100 | 189 | config FB_SA1100 |
187 | bool "SA-1100 LCD support" | 190 | bool "SA-1100 LCD support" |
@@ -405,7 +408,7 @@ config FB_CT65550 | |||
405 | 65550 graphics chip in PowerBooks. | 408 | 65550 graphics chip in PowerBooks. |
406 | 409 | ||
407 | config FB_ASILIANT | 410 | config FB_ASILIANT |
408 | bool "Chips 69000 display support" | 411 | bool "Asiliant (Chips) 69000 display support" |
409 | depends on (FB = y) && PCI | 412 | depends on (FB = y) && PCI |
410 | select FB_CFB_FILLRECT | 413 | select FB_CFB_FILLRECT |
411 | select FB_CFB_COPYAREA | 414 | select FB_CFB_COPYAREA |
@@ -422,12 +425,6 @@ config FB_IMSTT | |||
422 | The IMS Twin Turbo is a PCI-based frame buffer card bundled with | 425 | The IMS Twin Turbo is a PCI-based frame buffer card bundled with |
423 | many Macintosh and compatible computers. | 426 | many Macintosh and compatible computers. |
424 | 427 | ||
425 | config FB_S3TRIO | ||
426 | bool "S3 Trio display support" | ||
427 | depends on (FB = y) && PPC && BROKEN | ||
428 | help | ||
429 | If you have a S3 Trio say Y. Say N for S3 Virge. | ||
430 | |||
431 | config FB_VGA16 | 428 | config FB_VGA16 |
432 | tristate "VGA 16-color graphics support" | 429 | tristate "VGA 16-color graphics support" |
433 | depends on FB && (X86 || PPC) | 430 | depends on FB && (X86 || PPC) |
@@ -1047,6 +1044,12 @@ config FB_ATY_GX | |||
1047 | is at | 1044 | is at |
1048 | <http://support.ati.com/products/pc/mach64/graphics_xpression.html>. | 1045 | <http://support.ati.com/products/pc/mach64/graphics_xpression.html>. |
1049 | 1046 | ||
1047 | config FB_S3TRIO | ||
1048 | bool "S3 Trio display support" | ||
1049 | depends on (FB = y) && PPC && BROKEN | ||
1050 | help | ||
1051 | If you have a S3 Trio say Y. Say N for S3 Virge. | ||
1052 | |||
1050 | config FB_SAVAGE | 1053 | config FB_SAVAGE |
1051 | tristate "S3 Savage support" | 1054 | tristate "S3 Savage support" |
1052 | depends on FB && PCI && EXPERIMENTAL | 1055 | depends on FB && PCI && EXPERIMENTAL |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 6a9ae2b3d1ab..81d44995f9eb 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -98,6 +98,8 @@ config FRAMEBUFFER_CONSOLE | |||
98 | tristate "Framebuffer Console support" | 98 | tristate "Framebuffer Console support" |
99 | depends on FB | 99 | depends on FB |
100 | select CRC32 | 100 | select CRC32 |
101 | help | ||
102 | Low-level framebuffer-based console driver. | ||
101 | 103 | ||
102 | config STI_CONSOLE | 104 | config STI_CONSOLE |
103 | tristate "STI text console" | 105 | tristate "STI text console" |
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig index 3e9ccf370ab2..8cb7fb4db441 100644 --- a/drivers/video/logo/Kconfig +++ b/drivers/video/logo/Kconfig | |||
@@ -7,6 +7,8 @@ menu "Logo configuration" | |||
7 | config LOGO | 7 | config LOGO |
8 | bool "Bootup logo" | 8 | bool "Bootup logo" |
9 | depends on FB || SGI_NEWPORT_CONSOLE | 9 | depends on FB || SGI_NEWPORT_CONSOLE |
10 | help | ||
11 | Enable and select frame buffer bootup logos. | ||
10 | 12 | ||
11 | config LOGO_LINUX_MONO | 13 | config LOGO_LINUX_MONO |
12 | bool "Standard black and white Linux logo" | 14 | bool "Standard black and white Linux logo" |