2 files changed, 1 insertions, 20 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
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index bc692a15e2ad..03a9c35e9f55 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -490,7 +490,6 @@ static void tgui_copy_rect(struct tridentfb_par *par,
 /*
  * Accel functions called by the upper layers
  */
-#ifdef CONFIG_FB_TRIDENT_ACCEL
 static void tridentfb_fillrect(struct fb_info *info,
                                const struct fb_fillrect *fr)
 {
@@ -565,11 +564,6 @@ static int tridentfb_sync(struct fb_info *info)
                 par->wait_engine(par);
         return 0;
 }
-#else
-#define tridentfb_fillrect cfb_fillrect
-#define tridentfb_copyarea cfb_copyarea
-#define tridentfb_imageblit cfb_imageblit
-#endif /* CONFIG_FB_TRIDENT_ACCEL */
 
 /*
  * Hardware access functions
@@ -1333,9 +1327,7 @@ static struct fb_ops tridentfb_ops = {
         .fb_fillrect = tridentfb_fillrect,
         .fb_copyarea = tridentfb_copyarea,
         .fb_imageblit = tridentfb_imageblit,
-#ifdef CONFIG_FB_TRIDENT_ACCEL
         .fb_sync = tridentfb_sync,
-#endif
 };
 
 static int __devinit trident_pci_probe(struct pci_dev *dev,
@@ -1359,10 +1351,6 @@ static int __devinit trident_pci_probe(struct pci_dev *dev,
 
         chip_id = id->device;
 
-#ifndef CONFIG_FB_TRIDENT_ACCEL
-        noaccel = 1;
-#endif
-
         /* If PCI id is 0x9660 then further detect chip type */
 
         if (chip_id == TGUI9660) {