XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Fixed merging error in RTL8139.Asm for net-branch

Browse Source 
git-svn-id: svn://kolibrios.org@1478 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2010-06-01 14:53:43 +00:00
parent 78ac700d57
commit 63480d7af3
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/branches/net/drivers/RTL8139.asm
View File

@ -283,11 +283,7 @@ align 4
proc service_proc stdcall, ioctl:dword
mov edx, [ioctl]
<<<<<<< .mine
mov eax, [IOCTL.io_code]
=======
mov eax, [edx+IOCTL.io_code]
>>>>>>> .r1471
;------------------------------------------------------