os-k-team/os-k
os-k-team/os-k
1
0
Fork 0
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git synced 2023-08-25 14:03:10 +02:00
Code Releases Activity

Update with pci

Browse Source
This commit is contained in:
Adrien Bourmault 2020-02-13 13:44:53 +01:00
parent b21c07a8e2
commit 6e92ac64f1
No known key found for this signature in database
GPG Key ID: AFEE5788AEE3F4EC
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kaleid/kernel/init/init.c
View File

@ -38,11 +38,9 @@
#include <io/pci.h> #include <io/pci.h>
#include <po/shtdwn.h> #include <po/shtdwn.h>
#include <init/boot.h> #include <init/boot.h>
<<<<<<< HEAD
#include <io/pci.h> #include <io/pci.h>
#include <drivers/rtl8139.h> #include <drivers/rtl8139.h>
=======
>>>>>>> master
// //
// Entry point of the Kaleid kernel // Entry point of the Kaleid kernel