summaryrefslogtreecommitdiffstats
path: root/include/asm-parisc/grfioctl.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 03:17:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-04 03:17:47 +0100
commit89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch)
tree850ea412b013360bcace751db91cac6fb0067535 /include/asm-parisc/grfioctl.h
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
parent[PARISC] New syscalls (inotify, *at, pselect6/ppoll, migrate_pages) (diff)
downloadlinux-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.tar.xz
linux-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'include/asm-parisc/grfioctl.h')
-rw-r--r--include/asm-parisc/grfioctl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-parisc/grfioctl.h b/include/asm-parisc/grfioctl.h
index 6a910311b56b..671e06042b40 100644
--- a/include/asm-parisc/grfioctl.h
+++ b/include/asm-parisc/grfioctl.h
@@ -58,7 +58,7 @@
#define CRT_ID_ELK_1024DB 0x27849CA5 /* Elk 1024x768 double buffer */
#define CRT_ID_ELK_GS S9000_ID_A1924A /* Elk 1280x1024 GreyScale */
#define CRT_ID_CRX24 S9000_ID_A1439A /* Piranha */
-#define CRT_ID_VISUALIZE_EG 0x2D08C0A7 /* Graffiti (built-in B132+/B160L) */
+#define CRT_ID_VISUALIZE_EG 0x2D08C0A7 /* Graffiti, A4450A (built-in B132+/B160L) */
#define CRT_ID_THUNDER 0x2F23E5FC /* Thunder 1 VISUALIZE 48*/
#define CRT_ID_THUNDER2 0x2F8D570E /* Thunder 2 VISUALIZE 48 XP*/
#define CRT_ID_HCRX S9000_ID_HCRX /* Hyperdrive HCRX */