From 9312b1fe3306cfc044582f93d39b301258fcd438 Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Fri, 27 Nov 2015 18:20:35 -0500
Subject: [PATCH] merge with upstream

---
 input/input_driver.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/input/input_driver.c b/input/input_driver.c
index 5485f2f3d5..7689f310d6 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -274,6 +274,11 @@ static retro_input_t input_driver_keys_pressed(void)
          state |= rarch_cmd_get(driver->command, key);
 #endif
 
+#ifdef HAVE_NETWORK_GAMEPAD
+      if (driver->remote)
+         state |= input_remote_key_pressed(key,0);
+#endif
+
       if (state)
          ret |= (UINT64_C(1) << key);
    }