From: Evgeny Voevodin <e.voevodin@samsung.com>
Date: Mon, 17 Sep 2012 04:47:48 +0000 (+0400)
Subject: Fixes after merge.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=40e51d14a7c743e7b10aeb7566259b10215983c2;p=sdk%2Femulator%2Fqemu.git

Fixes after merge.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
---

diff --git a/hw/9pfs/virtio-9p-handle.c b/hw/9pfs/virtio-9p-handle.c
index 88f4ee7efc..669fd2d2ea 100644
--- a/hw/9pfs/virtio-9p-handle.c
+++ b/hw/9pfs/virtio-9p-handle.c
@@ -50,33 +50,11 @@
 #define O_PATH    010000000
 #endif
 
-#ifdef CONFIG_MARU // added by caramis
-#ifndef AT_REMOVEDIR
-#define AT_REMOVEDIR    0x200
-#endif
-#ifndef AT_EMPTY_PATH
-#define AT_EMPTY_PATH   0x1000  /* Allow empty relative pathname */
-#endif
-#ifndef O_PATH
-#define O_PATH    010000000
-#endif
-#endif
-
 struct handle_data {
     int mountfd;
     int handle_bytes;
 };
 
-#ifndef AT_REMOVEDIR
-#define AT_REMOVEDIR    0x200
-#endif
-#ifndef AT_EMPTY_PATH
-#define AT_EMPTY_PATH   0x1000  /* Allow empty relative pathname */
-#endif
-#ifndef O_PATH
-#define O_PATH    010000000
-#endif
-
 static inline int name_to_handle(int dirfd, const char *name,
                                  struct file_handle *fh, int *mnt_id, int flags)
 {
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 9e0d65f843..b011fd90ca 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -446,10 +446,6 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
 }
 
 static Property piix4_pm_properties[] = {
-#if defined(CONFIG_MARU) && defined(__x86_64__)
-    .qdev.name          = "MARU_PM",
-#else
-#endif
     DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
     DEFINE_PROP_END_OF_LIST(),
 };
@@ -473,7 +469,11 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data)
 }
 
 static TypeInfo piix4_pm_info = {
+#if defined(CONFIG_MARU) && defined(__x86_64__)
+    .name          = "MARU_PM",
+#else
     .name          = "PIIX4_PM",
+#endif
     .parent        = TYPE_PCI_DEVICE,
     .instance_size = sizeof(PIIX4PMState),
     .class_init    = piix4_pm_class_init,