[fireball] 25811: Merge 25810

Author: fireball
Date: Fri Feb 16 01:00:37 2007
New Revision: 25811

URL: http://svn.reactos.org/svn/reactos?rev=25811&view=rev
Log:
Merge 25810

Modified:
    branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf
    branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf
    branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf

Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/i...
==============================================================================
--- branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf (original)
+++ branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf Fri Feb 16 01:00:37 2007
@@ -27,7 +27,7 @@
 CopyFiles = PCNet_CopyFiles.NT

[PCNet_AddReg.NT]
-HKR,,Characteristics,0x00010001,0x0000000
+HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL
 HKR,,BUS_TO_SCAN,,"ALL"
 HKR,,BUSTIMER,,"0"
 HKR,,BUSTYPE,,"5"

Modified: branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/i...
==============================================================================
--- branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf (original)
+++ branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Fri Feb 16 01:00:37 2007
@@ -9,7 +9,7 @@
 Class      = Net
 ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider   = %ReactOS%
-DriverVer  = 02/15/2007,1.01.0.0
+DriverVer  = 02/15/2007,1.02

[DestinationDirs]
 DefaultDestDir = 12
@@ -27,7 +27,7 @@
 CopyFiles = NE2000_CopyFiles.NT

[NE2000_AddReg.NT]
-HKR,,Characteristics,0x00010001,0x0000000
+HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL
 HKR,,Port,0x00000000,"c100"
 HKR,,Irq,0x00000000,"B"
 HKR,,NetworkAddress,0x00000000,"001122334455"

Modified: branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/i...
==============================================================================
--- branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf (original)
+++ branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf Fri Feb 16 01:00:37 2007
@@ -9,7 +9,7 @@
 Class      = Net
 ClassGUID  = {4D36E972-E325-11CE-BFC1-08002BE10318}
 Provider   = %ReactOS%
-DriverVer  = 11/14/2005,1.00
+DriverVer  = 02/15/2007,1.01

[DestinationDirs]
 DefaultDestDir = 12
@@ -27,7 +27,7 @@
 CopyFiles = NE2000_CopyFiles.NT

[NE2000_AddReg.NT]
-HKR,,Characteristics,0x00010001,0x00000000
+HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL
 HKR,,BusType,0x00000000,"5"
 HKR,,Port,0x00000000,"c100"
 HKR,,Irq,0x00000000,"B"