Merge midi_driver.c and location_driver.c into retroarch.c -

files were not touched for 6 months so splitting them up serves
no real purpose

Makefile.common

@@ -242,8 +242,6 @@ OBJ += frontend/frontend_driver.o \
        record/record_driver.o \
        command.o \
        msg_hash.o \
-       midi_driver.o \
-       location_driver.o \
        intl/msg_hash_us.o \
        $(LIBRETRO_COMM_DIR)/queues/task_queue.o \
        tasks/task_content.o

cheevos/cheevos.c

@@ -1906,7 +1906,7 @@ void rcheevos_test(void)
 #ifdef HAVE_THREADS
    if (rcheevos_locals.queued_command != CMD_EVENT_NONE)
    {
-      if (rcheevos_locals.queued_command != CMD_CHEEVOS_NON_COMMAND)
+      if ((int)rcheevos_locals.queued_command != CMD_CHEEVOS_NON_COMMAND)
          command_event(rcheevos_locals.queued_command, NULL);
 
       rcheevos_locals.queued_command = CMD_EVENT_NONE;

griffin/griffin.c

@@ -1170,8 +1170,6 @@ RETROARCH
 #include "../runahead.c"
 #endif
 #include "../command.c"
-#include "../midi_driver.c"
-#include "../location_driver.c"
 #include "../ui/ui_companion_driver.c"
 #include "../libretro-common/queues/task_queue.c"
 

location_driver.h

@@ -19,8 +19,6 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "configuration.h"
-
 RETRO_BEGIN_DECLS
 
 typedef struct location_driver
@@ -103,27 +101,11 @@ void driver_location_stop(void);
  **/
 bool driver_location_start(void);
 
-void destroy_location(void);
-
-void location_driver_find_driver(
-      settings_t *settings,
-      const char *prefix,
-      bool verbosity_enabled);
-
-void uninit_location(void *data);
-
-bool init_location(
-      void *data,
-      settings_t *settings,
-      bool verbosity_enabled);
-
 location_driver_state_t *location_state_get_ptr(void);
 
 extern location_driver_t location_corelocation;
 extern location_driver_t location_android;
 
-extern const location_driver_t *location_drivers[];
-
 RETRO_END_DECLS
 
 #endif