---

yaml
---
r: 48063
b: refs/heads/master
c: 52e7c92
h: refs/heads/master
i:
  48061: be34a87
  48059: e4cdbcc
  48055: 10475ec
  48047: 9b30750
  48031: eeea8dd
  47999: 59ed087
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fdbe5cf27aff997e348c5f01b424ad734bd1d25
+refs/heads/master: 52e7c922f37907ab3cf3445b916fbbc53cbd6c75

trunk/drivers/video/Kconfig

@@ -1109,12 +1109,6 @@ config FB_ATY_BACKLIGHT
 	help
 	  Say Y here if you want to control the backlight of your display.
 
-config FB_S3TRIO
-	bool "S3 Trio display support"
-	depends on (FB = y) && PPC && BROKEN
-	help
-	  If you have a S3 Trio say Y. Say N for S3 Virge.
-
 config FB_S3
 	tristate "S3 Trio/Virge support"
 	depends on FB && PCI

trunk/drivers/video/Makefile

@@ -48,7 +48,6 @@ obj-$(CONFIG_FB_PLATINUM)         += platinumfb.o
 obj-$(CONFIG_FB_VALKYRIE)         += valkyriefb.o
 obj-$(CONFIG_FB_CT65550)          += chipsfb.o
 obj-$(CONFIG_FB_IMSTT)            += imsttfb.o
-obj-$(CONFIG_FB_S3TRIO)           += S3triofb.o
 obj-$(CONFIG_FB_FM2)              += fm2fb.o
 obj-$(CONFIG_FB_CYBLA)            += cyblafb.o
 obj-$(CONFIG_FB_TRIDENT)          += tridentfb.o