Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/external/qemu into mr1-staging

Change-Id: I8a4a71ac65b08e6e17f26c942f67a15b85211115

1 files changed, 0 insertions, 50 deletions

diff --git a/distrib/sdl-1.2.12/src/audio/ums/SDL_umsaudio.h b/distrib/sdl-1.2.12/src/audio/ums/SDL_umsaudio.h
deleted file mode 100644
index 97410cc..0000000
--- a/distrib/sdl-1.2.12/src/audio/ums/SDL_umsaudio.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Carsten Griwodz
-    griff@kom.tu-darmstadt.de
-
-    based on linux/SDL_dspaudio.h by Sam Lantinga
-*/
-#include "SDL_config.h"
-
-#ifndef _SDL_UMSaudio_h
-#define _SDL_UMSaudio_h
-
-#include <UMS/UMSAudioDevice.h>
-
-#include "../SDL_sysaudio.h"
-
-/* Hidden "this" pointer for the video functions */
-#define _THIS	SDL_AudioDevice *this
-
-struct SDL_PrivateAudioData
-{
-    /* Pointer to the (open) UMS audio device */
-    Environment*   ev;
-    UMSAudioDevice umsdev;
-
-    /* Raw mixing buffer */
-    UMSAudioTypes_Buffer playbuf;
-    UMSAudioTypes_Buffer fillbuf;
-
-    long bytesPerSample;
-};
-
-#endif /* _SDL_UMSaudio_h */
-