From bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6 Mon Sep 17 00:00:00 2001
From: David Marcec <dmarcecguzman@gmail.com>
Date: Sun, 22 Sep 2019 16:41:34 +1000
Subject: Rebase

---
 src/core/hle/service/hid/controllers/controller_base.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/hle/service/hid/controllers/controller_base.cpp')

diff --git a/src/core/hle/service/hid/controllers/controller_base.cpp b/src/core/hle/service/hid/controllers/controller_base.cpp
index cc935b031..2ea9b78d8 100644
--- a/src/core/hle/service/hid/controllers/controller_base.cpp
+++ b/src/core/hle/service/hid/controllers/controller_base.cpp
@@ -6,15 +6,15 @@
 
 namespace Service::HID {
 
-ControllerBase::ControllerBase() = default;
+ControllerBase::ControllerBase(Core::System& system) : system(system){};
 ControllerBase::~ControllerBase() = default;
 
-void ControllerBase::ActivateController(Core::System& system) {
+void ControllerBase::ActivateController() {
     if (is_activated) {
         OnRelease();
     }
     is_activated = true;
-    OnInit(system);
+    OnInit();
 }
 
 void ControllerBase::DeactivateController() {
-- 
cgit v1.2.3