Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

Merge branch 'master' into nfc_impl

Narr the Reg06d54056d624
diff --cc src/core/hle/service/nfp/nfp_device.h
index 6d8fc10994,3d1cb46095..b6a46f2ace
--- a/src/core/hle/service/nfp/nfp_device.h
+++ b/src/core/hle/service/nfp/nfp_device.h
@@@ -3,9 -3,11 +3,10 @@@
#pragma once
-#include <array>
+ #include <span>
#include <vector>
-#include "common/common_funcs.h"
+#include "common/common_types.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/nfp/nfp_types.h"
#include "core/hle/service/service.h"