aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/drivers/joycon.h
diff options
context:
space:
mode:
authoryuzubot <yuzu@yuzu-emu.org>2023-06-29 12:04:41 +0000
committeryuzubot <yuzu@yuzu-emu.org>2023-06-29 12:04:41 +0000
commita36e7efa276f2072d896d6a36475437b5220de05 (patch)
tree470116d2d52b3a74ad0cd761304f0f65386af708 /src/input_common/drivers/joycon.h
parent70d60c968fab622ad10cd4b1dfa1ed61c6b4c071 (diff)
"Merge Tagged PR 10937"mainline-0-1481
Diffstat (limited to 'src/input_common/drivers/joycon.h')
-rw-r--r--src/input_common/drivers/joycon.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input_common/drivers/joycon.h b/src/input_common/drivers/joycon.h
index 4c323d7d6a..112e970e15 100644
--- a/src/input_common/drivers/joycon.h
+++ b/src/input_common/drivers/joycon.h
@@ -17,7 +17,6 @@ struct Color;
struct MotionData;
struct TagInfo;
enum class ControllerType : u8;
-enum class DriverResult;
enum class IrsResolution;
class JoyconDriver;
} // namespace InputCommon::Joycon
@@ -112,7 +111,7 @@ private:
/// Returns the name of the device in text format
std::string JoyconName(Joycon::ControllerType type) const;
- Common::Input::NfcState TranslateDriverResult(Joycon::DriverResult result) const;
+ Common::Input::NfcState TranslateDriverResult(Common::Input::DriverResult result) const;
std::jthread scan_thread;