From 2b6c252747c43340df94100f1c53b18384fd7ef7 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Fri, 2 Dec 2011 02:22:29 +0100
Subject: [PATCH] Minor fixes.

---
 driver.c        | 3 +++
 driver.h        | 3 +--
 ps3/ps3_input.c | 3 ++-
 settings.c      | 8 ++------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/driver.c b/driver.c
index e3cd30ad24..7afeaff743 100644
--- a/driver.c
+++ b/driver.c
@@ -86,6 +86,9 @@ static const video_driver_t *video_drivers[] = {
 };
 
 static const input_driver_t *input_drivers[] = {
+#ifdef HAVE_PS3
+   &input_ps3,
+#endif
 #ifdef HAVE_SDL
    &input_sdl,
 #endif
diff --git a/driver.h b/driver.h
index 08742596f8..28d04a8eb6 100644
--- a/driver.h
+++ b/driver.h
@@ -167,15 +167,14 @@ extern const audio_driver_t audio_pulse;
 extern const audio_driver_t audio_ext;
 extern const audio_driver_t audio_dsound;
 extern const audio_driver_t audio_coreaudio;
-#ifdef __CELLOS_LV2__
 extern const audio_driver_t audio_ps3;
-#endif
 extern const video_driver_t video_gl;
 extern const video_driver_t video_xvideo;
 extern const video_driver_t video_sdl;
 extern const video_driver_t video_ext;
 extern const input_driver_t input_sdl;
 extern const input_driver_t input_x;
+extern const input_driver_t input_ps3;
 ////////////////////////////////////////////////
 
 #endif
diff --git a/ps3/ps3_input.c b/ps3/ps3_input.c
index 65aa6fb41d..b9f40827fc 100644
--- a/ps3/ps3_input.c
+++ b/ps3/ps3_input.c
@@ -107,5 +107,6 @@ const input_driver_t input_ps3 = {
    .init = ps3_input_init,
    .poll = ps3_input_poll,
    .input_state = ps3_input_state,
-   .free = ps3_free_input
+   .free = ps3_free_input,
+   .ident = "ps3",
 };
diff --git a/settings.c b/settings.c
index e7bb18c3e5..be70dba612 100644
--- a/settings.c
+++ b/settings.c
@@ -62,11 +62,9 @@ static void set_defaults(void)
 
    switch (AUDIO_DEFAULT_DRIVER)
    {
-      #ifdef __CELLOS_LV2__
       case AUDIO_PS3:
          def_audio = "ps3";
-	 break;
-      #endif
+         break;
       case AUDIO_RSOUND:
          def_audio = "rsound";
          break;
@@ -106,11 +104,9 @@ static void set_defaults(void)
 
    switch (INPUT_DEFAULT_DRIVER)
    {
-      #ifdef __CELLOS_LV2__
       case INPUT_PS3:
          def_input = "ps3";
-	 break;
-      #endif
+         break;
       case INPUT_SDL:
          def_input = "sdl";
          break;