commit 334ab475d2f27dbf6fbf836c2d4fb86dbb02a15c
author Jun Nakajima <jnakajim@gmail.com> Wed Feb 02 23:49:59 2011 -0800
committer Jun Nakajima <jnakajim@gmail.com> Wed Feb 02 23:49:59 2011 -0800
tree 31739daf9666b860cac11a6af58ec7d0cfb59bd4
parent 65842c595f20efb0522fe3684716388bc1e87477

x86: Add x86 support. Rebase the change (20906/1) due to a minor conflict.

Change-Id: Ic73cca0fc6c6e5cf74f63daa6080d00aa7c392bb
Signed-off-by: Xiaohui Xin <xiaohui.xin@intel.com>
Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com>
Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>

vl-android.c

diff --git a/vl-android.c b/vl-android.c
index 60c3a01..caef03d 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -4267,11 +4267,13 @@
             case QEMU_OPTION_rtc_td_hack:
                 rtc_td_hack = 1;
                 break;
+#ifndef CONFIG_ANDROID
             case QEMU_OPTION_acpitable:
                 if(acpi_table_add(optarg) < 0) {
                     PANIC("Wrong acpi table provided");
                 }
                 break;
+#endif
             case QEMU_OPTION_smbios:
                 if(smbios_entry_add(optarg) < 0) {
                     PANIC("Wrong smbios provided");