# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1244472830 -3600
# Node ID 140753303c4304d70729e7a7ab5b804374198de8
# Parent  5e4e9e6a5781424f836b3aa3c34bdb0a495b5519# Parent  1b9807f60740b75d69c406f7bb887c523a07fe77
Merge changes

diff -r 5e4e9e6a5781 -r 140753303c43 clean/sysdefs/system_model_os.xml
--- 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>