--- a/symbian4/os/kernelhwsrv/package_definition.xml	Wed Sep 01 10:15:26 2010 +0100
+++ b/symbian4/os/kernelhwsrv/package_definition.xml	Wed Sep 01 10:20:33 2010 +0100
@@ -50,9 +50,6 @@
       <component id="btrace" name="Kernel Trace Tool" purpose="mandatory">
         <unit bldFile="kernel/eka/drivers/trace" mrp="kernel/eka/drivers/trace/base_e32_drivers_trace.mrp"/>
       </component>
-      <component id="cameraldd" name="Camera Drivers" introduced="^3" purpose="optional">
-        <unit bldFile="kernel/eka/drivers/camerasc" mrp="kernel/eka/drivers/camerasc/base_drivers_camerasc.mrp"/>
-      </component>
       <component id="displayldd" name="Display Drivers" introduced="^3" purpose="optional">
         <!-- owned and maintained by graphics package. To be moved there as soon as technical limitations are resolved -->
         <unit bldFile="kernel/eka/drivers/display" mrp="kernel/eka/drivers/display/base_e32_drivers_display.mrp"/>
@@ -89,6 +86,9 @@
       <component id="fileserver" name="File Server" filter="gt" purpose="mandatory">
         <unit bldFile="userlibandfileserver/fileserver/group" mrp="userlibandfileserver/fileserver/group/base_f32.mrp"/>
       </component>
+      <component id="automounter" name="Automounter" filter="gt" purpose="mandatory">
+        <unit bldFile="userlibandfileserver/fileserver/automounter" mrp="userlibandfileserver/fileserver/automounter/base_f32_automounter.mrp"/>
+      </component>
       <component id="estart" name="Base Starter" filter="gt" purpose="optional">
         <unit bldFile="userlibandfileserver/fileserver/estart" mrp="userlibandfileserver/fileserver/estart/base_f32_estart.mrp"/>
       </component>