CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/common

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Wed Nov 24 02:59:24 UTC 2010

Modified Files:
        xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Configure.c

Log Message:
put back a little bit of BUS_ISA, enough for shark and chips driver.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.4	Tue Nov 23 06:38:03 2010
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Wed Nov 24 02:59:23 2010
@@ -176,6 +176,10 @@
         case BUS_SBUS:
             ret = bus_sbus_configure(busData);
 	        break;
+#if defined(__arm32__)
+	case BUS_ISA:
+	        break;
+#endif
         default:
 	        return NULL;
     }
@@ -205,6 +209,12 @@
         case BUS_SBUS:
             bus_sbus_newdev_configure(busData, i);
 	        break;
+#if defined(__arm32__)
+	case BUS_ISA:
+	    DevToConfig[i].GDev.busID = xnfalloc(6);
+	    strcpy(DevToConfig[i].GDev.busID, "ISA");
+	    break;
+#endif
         default:
 	        break;
     }