Author: akhaldi Date: Thu Jul 28 19:41:56 2016 New Revision: 72040
URL: http://svn.reactos.org/svn/reactos?rev=72040&view=rev Log: [0.4.2] * Merge Sylvain's machine.inf update in r72036.
Modified: branches/ros-branch-0_4_2/reactos/ (props changed) branches/ros-branch-0_4_2/reactos/media/inf/machine.inf
Propchange: branches/ros-branch-0_4_2/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 28 19:41:56 2016 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:72020-72022,72026,72028,72030,72032-72034 +/trunk/reactos:72020-72022,72026,72028,72030,72032-72034,72036
Modified: branches/ros-branch-0_4_2/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_2/reactos/media/i... ============================================================================== --- branches/ros-branch-0_4_2/reactos/media/inf/machine.inf [iso-8859-1] (original) +++ branches/ros-branch-0_4_2/reactos/media/inf/machine.inf [iso-8859-1] Thu Jul 28 19:41:56 2016 @@ -35,6 +35,7 @@ %*PNP0A00.DeviceDesc% = PCI_ISA_Inst,*PNP0A00 %*PNP0A03.DeviceDesc% = PCI_Inst,*PNP0A03 %*PNP0A05.DeviceDesc% = NO_DRV,*PNP0A05 +%*PNP0A06.DeviceDesc% = NO_DRV,*PNP0A06 %*PNP0A08.DeviceDesc% = PCI_Inst,*PNP0A08 %*PNP0B00.DeviceDesc% = NO_DRV,*PNP0B00 %*PNP0C01.DeviceDesc% = NO_DRV,*PNP0C01 @@ -156,6 +157,7 @@ *PNP0A00.DeviceDesc = "ISA bus" *PNP0A03.DeviceDesc = "PCI bus" *PNP0A05.DeviceDesc = "Generic ACPI bus" +*PNP0A06.DeviceDesc = "Extended I/O Bus / Generic container Device" *PNP0A08.DeviceDesc = "PCI bus" *PNP0B00.DeviceDesc = "AT real-time clock" *PNP0C01.DeviceDesc = "System board"