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

[Michael Lorenz]

Module Name:    xsrc
Committed By:   macallan
Date:           Tue Oct  6 06:24:43 UTC 2009

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

Log Message:
let xf86AddBusDeviceToConfigure() accept BUS_ISA and BUS_NONE


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    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.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.3
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c:1.2	Thu Jul 30 19:59:36 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Configure.c	Tue Oct  6 06:24:43 2009
@@ -123,6 +123,9 @@
 		return NULL;
 	break;
 #endif
+    case BUS_NONE:
+    case BUS_ISA:
+    	break;
     default:
 	return NULL;
     }
@@ -215,6 +218,11 @@
 	}
 	break;
 #endif
+    case BUS_ISA: {
+        NewDevice.GDev.busID = xnfalloc(6);
+        strcpy(NewDevice.GDev.busID, "ISA");
+    }
+    break;
     default:
 	break;
     }