--- a/src/video/android/SDL_androidvideo.c	Wed Jan 12 13:52:27 2011 -0800
+++ b/src/video/android/SDL_androidvideo.c	Wed Jan 12 13:52:41 2011 -0800
@@ -32,12 +32,12 @@
 
 #include "SDL_androidvideo.h"
 #include "SDL_androidevents.h"
+#include "SDL_androidkeyboard.h"
 
 #define ANDROID_VID_DRIVER_NAME "Android"
 
 /* Initialization/Query functions */
 static int Android_VideoInit(_THIS);
-static int Android_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
 static void Android_VideoQuit(_THIS);
 
 /* GL functions (SDL_androidgl.c) */
@@ -93,9 +93,8 @@
     /* Set the function pointers */
     device->VideoInit = Android_VideoInit;
     device->VideoQuit = Android_VideoQuit;
-    device->SetDisplayMode = Android_SetDisplayMode;
     device->PumpEvents = Android_PumpEvents;
-   
+
     device->free = Android_DeleteDevice;
 
     /* GL pointers */
@@ -136,18 +135,12 @@
     SDL_zero(mode);
     SDL_AddDisplayMode(&_this->displays[0], &mode);
 
-    Android_InitEvents();
+    Android_InitKeyboard();
 
     /* We're done! */
     return 0;
 }
 
-static int
-Android_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
-{
-    return 0;
-}
-
 void
 Android_VideoQuit(_THIS)
 {
@@ -160,5 +153,4 @@
 }
 
 
-
 /* vi: set ts=4 sw=4 expandtab: */