Update of /cvsroot/linux-vax/kernel-2.4/include/video
In directory usw-pr-cvs1:/tmp/cvs-serv10167/video
Modified Files:
fbcon.h macmodes.h newport.h
Log Message:
sync to 2.4.15 commit 2
Index: fbcon.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/video/fbcon.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fbcon.h 14 Jan 2001 16:59:07 -0000 1.1.1.1
+++ fbcon.h 9 Apr 2002 12:17:22 -0000 1.2
@@ -206,7 +206,7 @@
#define fb_writel sbus_writel
#define fb_memset sbus_memset_io
-#elif defined(__i386__) || defined(__alpha__)
+#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__)
#define fb_readb __raw_readb
#define fb_readw __raw_readw
Index: macmodes.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/video/macmodes.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- macmodes.h 14 Jan 2001 16:59:07 -0000 1.1.1.1
+++ macmodes.h 9 Apr 2002 12:17:22 -0000 1.2
@@ -38,7 +38,9 @@
#define VMODE_1152_870_75 18 /* 1152x870, 75Hz */
#define VMODE_1280_960_75 19 /* 1280x960, 75Hz */
#define VMODE_1280_1024_75 20 /* 1280x1024, 75Hz */
-#define VMODE_MAX 20
+#define VMODE_1152_768_60 21 /* 1152x768, 60Hz Titanium PowerBook */
+#define VMODE_1600_1024_60 22 /* 1600x1024, 60Hz 22" Cinema Display */
+#define VMODE_MAX 22
#define VMODE_CHOOSE 99
#define CMODE_NVRAM -1
Index: newport.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/include/video/newport.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- newport.h 14 Jan 2001 16:59:11 -0000 1.1.1.1
+++ newport.h 9 Apr 2002 12:17:22 -0000 1.2
@@ -486,7 +486,7 @@
* DCBMODE register defines:
*/
-/* Widht of the data being transfered for each DCBDATA[01] word */
+/* Width of the data being transferred for each DCBDATA[01] word */
#define DCB_DATAWIDTH_4 0x0
#define DCB_DATAWIDTH_1 0x1
#define DCB_DATAWIDTH_2 0x2
|
