- possibly fixed

Changed files:
    XFree86-ati.old-rename.patch -> 1.2

diff --git a/XFree86-ati.old-rename.patch b/XFree86-ati.old-rename.patch
index eec5ac117a222ddd8926dfa06faf6a844e8eec99..59e26b97ebadc17428c6fe25f3a54accc9d39220 100644 (file)
--- a/XFree86-ati.old-rename.patch
+++ b/XFree86-ati.old-rename.patch
@@ -1,6 +1,30 @@
+diff -urN ati.old.org/atimisc.c ati.old/atimisc.c
+--- ati.old.org/atimisc.c      Wed Mar 13 11:18:18 2002
++++ ati.old/atimisc.c  Wed Mar 13 11:19:27 2002
+@@ -71,7 +71,7 @@
+ }
+ 
+ /* The following record must be called atimiscModuleData */
+-XF86ModuleData atimiscModuleData =
++XF86ModuleData atimisc_oldModuleData =
+ {
+     &ATIVersionRec,
+     ATISetup,
+diff -urN ati.old.org/atimodule.c ati.old/atimodule.c
+--- ati.old.org/atimodule.c    Wed Mar 13 11:18:18 2002
++++ ati.old/atimodule.c        Wed Mar 13 11:19:40 2002
+@@ -116,7 +116,7 @@
+ }
+ 
+ /* The following record must be called atiModuleData */
+-XF86ModuleData atiModuleData =
++XF86ModuleData ati_oldModuleData =
+ {
+     &ATIVersionRec,
+     ATISetup,
 diff -urN ati.old.org/atiprobe.c ati.old/atiprobe.c
---- ati.old.org/atiprobe.c     Mon Mar 11 12:50:37 2002
-+++ ati.old/atiprobe.c Mon Mar 11 12:52:26 2002
+--- ati.old.org/atiprobe.c     Wed Mar 13 11:18:44 2002
++++ ati.old/atiprobe.c Mon Mar 11 13:14:51 2002
 @@ -2275,10 +2275,10 @@
  
  #ifdef XFree86LOADER
@@ -15,8 +39,8 @@ diff -urN ati.old.org/atiprobe.c ati.old/atiprobe.c
                  continue;
              }
 diff -urN ati.old.org/ativersion.h ati.old/ativersion.h
---- ati.old.org/ativersion.h   Mon Mar 11 12:50:37 2002
-+++ ati.old/ativersion.h       Mon Mar 11 12:52:01 2002
+--- ati.old.org/ativersion.h   Wed Mar 13 11:18:44 2002
++++ ati.old/ativersion.h       Mon Mar 11 13:14:51 2002
 @@ -25,7 +25,7 @@
  #define ___ATIVERSION_H___ 1
  
@@ -26,9 +50,21 @@ diff -urN ati.old.org/ativersion.h ati.old/ativersion.h
  
  #define ATI_VERSION_NAME  "6.4.8"
  
+diff -urN ati.old.org/r128_misc.c ati.old/r128_misc.c
+--- ati.old.org/r128_misc.c    Wed Mar 13 11:18:18 2002
++++ ati.old/r128_misc.c        Wed Mar 13 11:20:02 2002
+@@ -74,7 +74,7 @@
+ }
+ 
+ /* The following record must be called r128ModuleData */
+-XF86ModuleData r128ModuleData =
++XF86ModuleData r128_oldModuleData =
+ {
+     &R128VersionRec,
+     R128Setup,
 diff -urN ati.old.org/r128_probe.c ati.old/r128_probe.c
---- ati.old.org/r128_probe.c   Mon Mar 11 12:50:37 2002
-+++ ati.old/r128_probe.c       Mon Mar 11 12:53:28 2002
+--- ati.old.org/r128_probe.c   Wed Mar 13 11:18:44 2002
++++ ati.old/r128_probe.c       Mon Mar 11 13:14:51 2002
 @@ -205,9 +205,9 @@
  
  #ifdef XFree86LOADER
@@ -41,9 +77,21 @@ diff -urN ati.old.org/r128_probe.c ati.old/r128_probe.c
                xf86DeleteScreen(pScrn->scrnIndex, 0);
                continue;
            }
+diff -urN ati.old.org/radeon_misc.c ati.old/radeon_misc.c
+--- ati.old.org/radeon_misc.c  Wed Mar 13 11:18:18 2002
++++ ati.old/radeon_misc.c      Wed Mar 13 11:20:20 2002
+@@ -74,7 +74,7 @@
+ }
+ 
+ /* The following record must be called radeonModuleData */
+-XF86ModuleData radeonModuleData =
++XF86ModuleData radeon_oldModuleData =
+ {
+     &RADEONVersionRec,
+     RADEONSetup,
 diff -urN ati.old.org/radeon_probe.c ati.old/radeon_probe.c
---- ati.old.org/radeon_probe.c Mon Mar 11 12:50:37 2002
-+++ ati.old/radeon_probe.c     Mon Mar 11 12:53:09 2002
+--- ati.old.org/radeon_probe.c Wed Mar 13 11:18:44 2002
++++ ati.old/radeon_probe.c     Mon Mar 11 13:14:51 2002
 @@ -203,9 +203,9 @@
          { 
  #ifdef XFree86LOADER