tridentfb: delete acceleration Kconfig option

Remove Kconfig option for tridentfb acceleration.  The acceleration can be
switched off with modules "noaccel" parameter.

The acceleration for Trident chips was fixed in the 2.6.27 kernel.

Also, add CyberXXX and CyberBlade names to Kconfig option's name.  It should
make easier to find the tridentfb choice for cyblafb driver's users.  The
cyblafb driver has been replaced by the tridentfb driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 1 insertions, 8 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index db7a4f42edad..ffe2f2796e29 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1598,7 +1598,7 @@ config FB_VT8623
           VIA VT8623 [Apollo CLE266] chipset.
 
 config FB_TRIDENT
-        tristate "Trident support"
+        tristate "Trident/CyberXXX/CyberBlade support"
         depends on FB && PCI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
@@ -1617,13 +1617,6 @@ config FB_TRIDENT
           To compile this driver as a module, choose M here: the
           module will be called tridentfb.
 
-config FB_TRIDENT_ACCEL
-        bool "Trident Acceleration functions (EXPERIMENTAL)"
-        depends on FB_TRIDENT && EXPERIMENTAL
-        ---help---
-        This will compile the Trident frame buffer device with
-        acceleration functions.
-
 config FB_ARK
         tristate "ARK 2000PV support"
         depends on FB && PCI