From b41e725eae02e825c181f17e863dec5d9d6089c8 Mon Sep 17 00:00:00 2001
From: James Dong <jdong@google.com>
Date: Mon, 4 May 2009 11:16:30 -0700
Subject: [PATCH] merged 2d2a9acac29650e23e025fdbce831c0bfa9667df with
 conflicts....

---
 core/prelink-linux-arm.map | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index e8b0fd305a..03ce456c2f 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -122,10 +122,7 @@ libopencorehw.so              0xA6F50000
 
 # pv libraries
 libopencore_common.so         0xA6000000
-libopencore_2way.so           0xA5A00000
-
-libqcomm_omx.so         0xA5000000
-libmm-adspsvc.so        0xA4FFD000
+libqcomm_omx.so               0xA5A00000
 
 # libraries for specific apps or temporary libraries
 libcam_ipl.so           0x9F000000