aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-07-23 21:31:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-24 10:47:36 -0700
commit01a2d9ed85c945fc8a672622780533a1a0b7caf5 (patch)
tree4f1f29a479d1dd4e8921223c2abed28bcc980a2a /include
parent34dec24317d6824b7db172bb0072b909a9c376f2 (diff)
downloadmrst-s0i3-test-01a2d9ed85c945fc8a672622780533a1a0b7caf5.tar.gz
mrst-s0i3-test-01a2d9ed85c945fc8a672622780533a1a0b7caf5.tar.xz
mrst-s0i3-test-01a2d9ed85c945fc8a672622780533a1a0b7caf5.zip
tridentfb: acceleration constants change
This patch replaces deprecated constant FB_ACCELF_TEXT with FBINFO_HWACCEL_DISABLED and adds constants for Trident families of accelerators. The FBINFO_HWACCEL_DISABLED is correctly used so noaccel parameter works now. 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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/fb.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h
index 72295b09922..a084d133586 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -120,6 +120,10 @@ struct dentry;
#define FB_ACCEL_XGI_VOLARI_V 47 /* XGI Volari V3XT, V5, V8 */
#define FB_ACCEL_XGI_VOLARI_Z 48 /* XGI Volari Z7 */
#define FB_ACCEL_OMAP1610 49 /* TI OMAP16xx */
+#define FB_ACCEL_TRIDENT_TGUI 50 /* Trident TGUI */
+#define FB_ACCEL_TRIDENT_3DIMAGE 51 /* Trident 3DImage */
+#define FB_ACCEL_TRIDENT_BLADE3D 52 /* Trident Blade3D */
+#define FB_ACCEL_TRIDENT_BLADEXP 53 /* Trident BladeXP */
#define FB_ACCEL_NEOMAGIC_NM2070 90 /* NeoMagic NM2070 */
#define FB_ACCEL_NEOMAGIC_NM2090 91 /* NeoMagic NM2090 */
#define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */