Merge branch 'master' into isa/arm64

[lunaix-os.git] / lunaix-os / hal / char / uart / 16x50_isa.c

diff --git a/lunaix-os/hal/char/uart/16x50_isa.c b/lunaix-os/hal/char/uart/16x50_isa.c
index 128803e29aa050a4c84fa1c11effcf3aed40146d..414dc334645ec3a63de6e279299066c024319066 100644 (file)
--- a/lunaix-os/hal/char/uart/16x50_isa.c
+++ b/lunaix-os/hal/char/uart/16x50_isa.c
@@ -1,8 +1,8 @@
 #include <lunaix/device.h>
 #include <lunaix/device.h>

-#include <asm-generic/isrm.h>

 #include <lunaix/syslog.h>
 
 #include <asm/x86_pmio.h>
 #include <lunaix/syslog.h>
 
 #include <asm/x86_pmio.h>

+#include <asm/x86_isrm.h>

 
 #include "16x50.h"
 
 
 #include "16x50.h"
 


@@ -58,7 +58,7 @@ upiom_init(struct device_def* def)
 
 static struct device_def uart_pmio_def = {
     .class = DEVCLASS(DEVIF_SOC, DEVFN_CHAR, DEV_UART16550),
 
 static struct device_def uart_pmio_def = {
     .class = DEVCLASS(DEVIF_SOC, DEVFN_CHAR, DEV_UART16550),

-    .name = "16550 UART (PIO)",
+    .name = "16550 UART (pmio, isa-bus)",

     .init = upiom_init
 };
 EXPORT_DEVICE(uart16550_pmio, &uart_pmio_def, load_onboot);
\ No newline at end of file
     .init = upiom_init
 };
 EXPORT_DEVICE(uart16550_pmio, &uart_pmio_def, load_onboot);
\ No newline at end of file