Merge changes
authorShabe Razvi <shaber@symbian.org>
Mon, 08 Jun 2009 15:53:50 +0100
changeset 82 140753303c43
parent 81 5e4e9e6a5781 (current diff)
parent 79 1b9807f60740 (diff)
child 83 250463a249a1
Merge changes
--- a/clean/sysdefs/system_model_os.xml	Mon Jun 08 15:52:27 2009 +0100
+++ b/clean/sysdefs/system_model_os.xml	Mon Jun 08 15:53:50 2009 +0100
@@ -731,9 +731,9 @@
             <component name="Feature Registry" introduced="9.2" deprecated="9.6">
               <unit bldFile="os\persistentdata\featuremgmt\featureregistry\group" mrp="os\persistentdata\featuremgmt\featureregistry\group\syslibs_featreg.mrp"/>
             </component>
-            <component name="Hardware Resources Manager" introduced="9.5">
+            <!-- component name="Hardware Resources Manager" introduced="9.5">
               <unit bldFile="os\devicesrv\resourcemgmt\hwresourcesmgr\group" mrp="os\devicesrv\resourcemgmt\hwresourcesmgr\group\telephony_hwrm.mrp"/>
-            </component>
+            </component -->
             <component name="Power and Memory Notification Service" introduced="6.0">
               <unit bldFile="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group" mrp="os\devicesrv\resourcemgmt\powerandmemorynotificationservice\group\syslibs_pwrcli.mrp"/>
             </component>