Stash "DONE"

# Conflicts:
#	src/citra_qt/bootmanager.cpp
#	src/citra_qt/configuration/configure_motion_touch.ui
#	src/citra_qt/main.cpp
#	src/common/settings.cpp
#	src/core/CMakeLists.txt
#	src/core/core.h

src/input_common/input_mapping.cpp

@@ -195,8 +195,7 @@ bool MappingFactory::IsDriverValid(const MappingData& data) const {
         return false;
     }
     // To prevent mapping with two devices we disable any UDP except motion
-    if (!Settings::values.enable_udp_controller && data.engine == "cemuhookudp" &&
-        data.type != EngineInputType::Motion) {
+    if (data.engine == "cemuhookudp" && data.type != EngineInputType::Motion) {
         return false;
     }
     // The following drivers don't need to be mapped