diff --git a/Kernel/Arch/init.cpp b/Kernel/Arch/init.cpp index 251ae3d85a..e6a11e316d 100644 --- a/Kernel/Arch/init.cpp +++ b/Kernel/Arch/init.cpp @@ -68,7 +68,7 @@ # include # include # include -# include +# include #elif ARCH(AARCH64) # include # include diff --git a/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp b/Kernel/Arch/x86_64/VGA/TextModeConsole.cpp similarity index 98% rename from Kernel/Devices/GPU/Console/VGATextModeConsole.cpp rename to Kernel/Arch/x86_64/VGA/TextModeConsole.cpp index 850ef31fe8..615b30b301 100644 --- a/Kernel/Devices/GPU/Console/VGATextModeConsole.cpp +++ b/Kernel/Arch/x86_64/VGA/TextModeConsole.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Kernel/Devices/GPU/Console/VGATextModeConsole.h b/Kernel/Arch/x86_64/VGA/TextModeConsole.h similarity index 100% rename from Kernel/Devices/GPU/Console/VGATextModeConsole.h rename to Kernel/Arch/x86_64/VGA/TextModeConsole.h diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 482504f9ac..59f3322998 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -89,7 +89,6 @@ set(KERNEL_SOURCES Devices/GPU/Console/BootFramebufferConsole.cpp Devices/GPU/Console/GenericFramebufferConsole.cpp Devices/GPU/Console/ContiguousFramebufferConsole.cpp - Devices/GPU/Console/VGATextModeConsole.cpp Devices/GPU/DisplayConnector.cpp Devices/GPU/Generic/DisplayConnector.cpp Devices/GPU/Management.cpp @@ -424,6 +423,7 @@ if ("${SERENITY_ARCH}" STREQUAL "x86_64") Arch/x86_64/PCI/MSI.cpp Arch/x86_64/VGA/IOArbiter.cpp + Arch/x86_64/VGA/TextModeConsole.cpp Arch/x86_64/PowerState.cpp Arch/x86_64/RTC.cpp diff --git a/Meta/gn/secondary/Kernel/BUILD.gn b/Meta/gn/secondary/Kernel/BUILD.gn index 62194b0884..a42d13e5bd 100644 --- a/Meta/gn/secondary/Kernel/BUILD.gn +++ b/Meta/gn/secondary/Kernel/BUILD.gn @@ -514,7 +514,6 @@ executable("Kernel_bin") { "Devices/GPU/Console/BootFramebufferConsole.cpp", "Devices/GPU/Console/ContiguousFramebufferConsole.cpp", "Devices/GPU/Console/GenericFramebufferConsole.cpp", - "Devices/GPU/Console/VGATextModeConsole.cpp", "Devices/GPU/DisplayConnector.cpp", "Devices/GPU/Generic/DisplayConnector.cpp", "Devices/GPU/Intel/Auxiliary/GMBusConnector.cpp",