Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / drivers / video / sis / init.h

diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index aff73842d877b3b98c287b50dc1cbdf138ed6cc7..85d6738b6c64ad2755629f6d71596da9a0f0bfd8 100644 (file)
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -105,51 +105,6 @@ static const unsigned short ModeIndex_1920x1440[]    = {0x68, 0x69, 0x00, 0x6b};
 static const unsigned short ModeIndex_300_2048x1536[]= {0x6c, 0x6d, 0x00, 0x00};
 static const unsigned short ModeIndex_310_2048x1536[]= {0x6c, 0x6d, 0x00, 0x6e};
 
-static const unsigned short SiS_DRAMType[17][5]={
-       {0x0C,0x0A,0x02,0x40,0x39},
-       {0x0D,0x0A,0x01,0x40,0x48},
-       {0x0C,0x09,0x02,0x20,0x35},
-       {0x0D,0x09,0x01,0x20,0x44},
-       {0x0C,0x08,0x02,0x10,0x31},
-       {0x0D,0x08,0x01,0x10,0x40},
-       {0x0C,0x0A,0x01,0x20,0x34},
-       {0x0C,0x09,0x01,0x08,0x32},
-       {0x0B,0x08,0x02,0x08,0x21},
-       {0x0C,0x08,0x01,0x08,0x30},
-       {0x0A,0x08,0x02,0x04,0x11},
-       {0x0B,0x0A,0x01,0x10,0x28},
-       {0x09,0x08,0x02,0x02,0x01},
-       {0x0B,0x09,0x01,0x08,0x24},
-       {0x0B,0x08,0x01,0x04,0x20},
-       {0x0A,0x08,0x01,0x02,0x10},
-       {0x09,0x08,0x01,0x01,0x00}
-};
-
-static const unsigned short SiS_SDRDRAM_TYPE[13][5] =
-{
-       { 2,12, 9,64,0x35},
-       { 1,13, 9,64,0x44},
-       { 2,12, 8,32,0x31},
-       { 2,11, 9,32,0x25},
-       { 1,12, 9,32,0x34},
-       { 1,13, 8,32,0x40},
-       { 2,11, 8,16,0x21},
-       { 1,12, 8,16,0x30},
-       { 1,11, 9,16,0x24},
-       { 1,11, 8, 8,0x20},
-       { 2, 9, 8, 4,0x01},
-       { 1,10, 8, 4,0x10},
-       { 1, 9, 8, 2,0x00}
-};
-
-static const unsigned short SiS_DDRDRAM_TYPE[4][5] =
-{
-       { 2,12, 9,64,0x35},
-       { 2,12, 8,32,0x31},
-       { 2,11, 8,16,0x21},
-       { 2, 9, 8, 4,0x01}
-};
-
 static const unsigned char SiS_MDA_DAC[] =
 {
        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,