diff for duplicates of <1290203931-25188-5-git-send-email-aaro.koskinen@iki.fi>
diff --git a/a/1.txt b/N1/1.txt
index 07ebaa5..d32b72b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -78,7 +78,7 @@ index 53e30ea..5634dfb 100644
- templ = pciReadLong(0x00000000, 0x50);
-#endif
- if(SiS_Pr->ChipType == SIS_730) {
+ if(SiS_Pr->ChipType = SIS_730) {
@@ -2528,13 +2516,8 @@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
@@ -93,7 +93,7 @@ index 53e30ea..5634dfb 100644
-#endif
/* GUI grant timer (PCI config 0xA3) */
- if(SiS_Pr->ChipType == SIS_730) {
+ if(SiS_Pr->ChipType = SIS_730) {
@@ -2550,11 +2533,7 @@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo,
}
@@ -129,7 +129,7 @@ index 53e30ea..5634dfb 100644
-#endif
somebase &= 0xffff;
- if(somebase == 0) return;
+ if(somebase = 0) return;
@@ -3183,13 +3156,8 @@ SiS_Handle760(struct SiS_Private *SiS_Pr)
temp2 = 0x0b;
}
@@ -234,7 +234,7 @@ index 53e30ea..5634dfb 100644
var->vsync_len = C;
-#endif
- if((xres == 320) && ((yres == 200) || (yres == 240))) {
+ if((xres = 320) && ((yres = 200) || (yres = 240))) {
/* Terrible hack, but correct CRTC data for
@@ -3693,11 +3645,9 @@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,
* a negative D. The CRT controller does not
@@ -403,7 +403,7 @@ index a4b344e..78055f6 100644
- pciA0 = pciReadLong(0x00000000, 0xA0);
-#endif
- if(SiS_Pr->ChipType == SIS_730) {
+ if(SiS_Pr->ChipType = SIS_730) {
@@ -8872,9 +8853,7 @@ SiS_SetCH701x(struct SiS_Private *SiS_Pr, unsigned short reg, unsigned char val)
SiS_SetChReg(SiS_Pr, reg, val, 0);
diff --git a/a/content_digest b/N1/content_digest
index 1834122..e69ad6d 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH 4/9] sisfb: delete redudant #define SIS_LINUX_KERNEL\0"
]
[
- "Date\0Fri, 19 Nov 2010 23:58:46 +0200\0"
+ "Date\0Fri, 19 Nov 2010 21:58:46 +0000\0"
]
[
"To\0linux-fbdev\@vger.kernel.org",
@@ -105,7 +105,7 @@
"- templ = pciReadLong(0x00000000, 0x50);\n",
"-#endif\n",
" \n",
- " if(SiS_Pr->ChipType == SIS_730) {\n",
+ " if(SiS_Pr->ChipType = SIS_730) {\n",
" \n",
"\@\@ -2528,13 +2516,8 \@\@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo,\n",
" \n",
@@ -120,7 +120,7 @@
"-#endif\n",
" \n",
" /* GUI grant timer (PCI config 0xA3) */\n",
- " if(SiS_Pr->ChipType == SIS_730) {\n",
+ " if(SiS_Pr->ChipType = SIS_730) {\n",
"\@\@ -2550,11 +2533,7 \@\@ SiS_SetCRT1FIFO_630(struct SiS_Private *SiS_Pr, unsigned short ModeNo,\n",
" \n",
" }\n",
@@ -156,7 +156,7 @@
"-#endif\n",
" somebase &= 0xffff;\n",
" \n",
- " if(somebase == 0) return;\n",
+ " if(somebase = 0) return;\n",
"\@\@ -3183,13 +3156,8 \@\@ SiS_Handle760(struct SiS_Private *SiS_Pr)\n",
" temp2 = 0x0b;\n",
" }\n",
@@ -261,7 +261,7 @@
" var->vsync_len = C;\n",
"-#endif\n",
" \n",
- " if((xres == 320) && ((yres == 200) || (yres == 240))) {\n",
+ " if((xres = 320) && ((yres = 200) || (yres = 240))) {\n",
" \t/* Terrible hack, but correct CRTC data for\n",
"\@\@ -3693,11 +3645,9 \@\@ SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata,\n",
" \t * a negative D. The CRT controller does not\n",
@@ -430,7 +430,7 @@
"-\tpciA0 = pciReadLong(0x00000000, 0xA0);\n",
"-#endif\n",
" \n",
- " if(SiS_Pr->ChipType == SIS_730) {\n",
+ " if(SiS_Pr->ChipType = SIS_730) {\n",
" \n",
"\@\@ -8872,9 +8853,7 \@\@ SiS_SetCH701x(struct SiS_Private *SiS_Pr, unsigned short reg, unsigned char val)\n",
" SiS_SetChReg(SiS_Pr, reg, val, 0);\n",
@@ -591,4 +591,4 @@
"1.5.6.5"
]
-e4e5a073a6f133effffca514e4bc914ebd8e8a42a9ed7978a69eaaa77e03e76d
+aec11cf94303246d9e6bae4b918339bc0833fc8908dcb980de6df305a8132b00
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.