vserver 1.9.5.x5

[linux-2.6.git] / drivers / video / sis / oem300.h

diff --git a/drivers/video/sis/oem300.h b/drivers/video/sis/oem300.h
index d644464..b1358b7 100644 (file)
--- a/drivers/video/sis/oem300.h
+++ b/drivers/video/sis/oem300.h
@@ -35,7 +35,7 @@
  * * 3) The name of the author may not be used to endorse or promote products
  * *    derived from this software without specific prior written permission.
  * *
- * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
+ * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
@@ -50,7 +50,7 @@
  *
  */
 
-const UCHAR SiS300_OEMTVDelay301[8][4] =
+static const UCHAR SiS300_OEMTVDelay301[8][4] =
 {
        {0x08,0x08,0x08,0x08},
        {0x08,0x08,0x08,0x08},
@@ -62,7 +62,7 @@ const UCHAR SiS300_OEMTVDelay301[8][4] =
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_OEMTVDelayLVDS[8][4] =
+static const UCHAR SiS300_OEMTVDelayLVDS[8][4] =
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -74,7 +74,7 @@ const UCHAR SiS300_OEMTVDelayLVDS[8][4] =
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_OEMTVFlicker[8][4] =
+static const UCHAR SiS300_OEMTVFlicker[8][4] =
 {
        {0x00,0x00,0x00,0x00},
        {0x00,0x00,0x00,0x00},
@@ -87,7 +87,7 @@ const UCHAR SiS300_OEMTVFlicker[8][4] =
 };
 
 #if 0   /* TW: Not used */
-const UCHAR SiS300_OEMLCDDelay1[12][4]={
+static const UCHAR SiS300_OEMLCDDelay1[12][4]={
        {0x2c,0x2c,0x2c,0x2c},
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -103,8 +103,8 @@ const UCHAR SiS300_OEMLCDDelay1[12][4]={
 };
 #endif
 
-/* TW: From 630/301B BIOS */
-const UCHAR SiS300_OEMLCDDelay2[64][4] =                /* for 301/301b/302b/301LV/302LV */
+/* From 630/301B BIOS */
+static const UCHAR SiS300_OEMLCDDelay2[64][4] =                 /* for 301/301b/302b/301LV/302LV */
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -172,8 +172,8 @@ const UCHAR SiS300_OEMLCDDelay2[64][4] =             /* for 301/301b/302b/301LV/302LV */
        {0x20,0x20,0x20,0x20}
 };
 
-/* TW: From 300/301LV BIOS */
-const UCHAR SiS300_OEMLCDDelay4[12][4] =
+/* From 300/301LV BIOS */
+static const UCHAR SiS300_OEMLCDDelay4[12][4] =
 {
        {0x2c,0x2c,0x2c,0x2c},
        {0x20,0x20,0x20,0x20},
@@ -189,8 +189,8 @@ const UCHAR SiS300_OEMLCDDelay4[12][4] =
        {0x24,0x24,0x24,0x24}
 };
 
-/* TW: From 300/301LV BIOS */
-const UCHAR SiS300_OEMLCDDelay5[32][4] =
+/* From 300/301LV BIOS */
+static const UCHAR SiS300_OEMLCDDelay5[32][4] =
 {
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -226,8 +226,8 @@ const UCHAR SiS300_OEMLCDDelay5[32][4] =
        {0x20,0x20,0x20,0x20},
 };
 
-/* TW: Added for LVDS */
-const UCHAR SiS300_OEMLCDDelay3[64][4] = {     /* For LVDS */
+/* Added for LVDS */
+static const UCHAR SiS300_OEMLCDDelay3[64][4] = {      /* For LVDS */
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
        {0x20,0x20,0x20,0x20},
@@ -294,7 +294,7 @@ const UCHAR SiS300_OEMLCDDelay3[64][4] = {  /* For LVDS */
        {0x20,0x20,0x20,0x20}
 };
 
-const UCHAR SiS300_Phase1[8][5][4] =
+static const UCHAR SiS300_Phase1[8][5][4] =
 {
     {
        {0x21,0xed,0x00,0x08},
@@ -355,7 +355,7 @@ const UCHAR SiS300_Phase1[8][5][4] =
 };
 
 
-const UCHAR SiS300_Phase2[8][5][4] =
+static const UCHAR SiS300_Phase2[8][5][4] =
 {
     {
         {0x21,0xed,0x00,0x08},
@@ -415,7 +415,7 @@ const UCHAR SiS300_Phase2[8][5][4] =
     }
 };
 
-const UCHAR SiS300_Filter1[10][16][4] =
+static const UCHAR SiS300_Filter1[10][16][4] =
 {
     {
        {0x00,0xf4,0x10,0x38},
@@ -599,7 +599,7 @@ const UCHAR SiS300_Filter1[10][16][4] =
     },
 };
 
-const UCHAR SiS300_Filter2[10][9][7] =
+static const UCHAR SiS300_Filter2[10][9][7] =
 {
     {
        {0xFF,0x03,0x02,0xF6,0xFC,0x27,0x46},
@@ -714,7 +714,7 @@ const UCHAR SiS300_Filter2[10][9][7] =
 };
 
 /* Custom data for Barco iQ Pro R300 */
-const UCHAR barco_p1[2][9][7][3] = {
+static const UCHAR barco_p1[2][9][7][3] = {
     {
        {  { 0x16, 0xcf, 0x00 },
           { 0x18, 0x00, 0x00 },