aboutsummaryrefslogtreecommitdiffstats
path: root/vl-android.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-05-04 01:59:07 -0700
committerAndroid Code Review <code-review@android.com>2011-05-04 01:59:07 -0700
commit46fd095b9f5d7e2434cebd407435e662f8e2df54 (patch)
tree7832607180923d12fc0775b7bd34ad45fe83bc77 /vl-android.c
parentdb6c47f81a31448407415fea160ac0b60ab7ee5a (diff)
parentc0ac73377011befa8a3e6444d61a80cd6ada2659 (diff)
downloadexternal_qemu-46fd095b9f5d7e2434cebd407435e662f8e2df54.zip
external_qemu-46fd095b9f5d7e2434cebd407435e662f8e2df54.tar.gz
external_qemu-46fd095b9f5d7e2434cebd407435e662f8e2df54.tar.bz2
Merge "Document new QEMU pipe implementation."
Diffstat (limited to 'vl-android.c')
-rw-r--r--vl-android.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vl-android.c b/vl-android.c
index abfa423..e151cc0 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -51,8 +51,9 @@
#include "charpipe.h"
#include "modem_driver.h"
#include "android/gps.h"
-#include "android/hw-qemud.h"
#include "android/hw-kmsg.h"
+#include "android/hw-pipe-net.h"
+#include "android/hw-qemud.h"
#include "android/charmap.h"
#include "android/globals.h"
#include "android/utils/bufprint.h"
@@ -63,7 +64,6 @@
#include "android/utils/tempfile.h"
#include "android/display-core.h"
#include "android/utils/timezone.h"
-#include "android/pipe-net.h"
#include "android/snapshot.h"
#include "targphys.h"
#include "tcpdump.h"