# HG changeset patch
# User andy simpson <andrews@symbian.org>
# Date 1271235840 -3600
# Node ID c3f5d7eacc87d75f844dff3324b118102218a05b
# Parent  467838f5fbabccc385611de3abfa63f5413c0f35# Parent  cf0489a7a8b13d2126c82499a3c4ef86080cbab8
merge heads - manual merge hal.mmp

diff -r cf0489a7a8b1 -r c3f5d7eacc87 omap3530/beagle_drivers/hal/hal.mmp
--- a/omap3530/beagle_drivers/hal/hal.mmp	Tue Mar 30 00:13:57 2010 +0100
+++ b/omap3530/beagle_drivers/hal/hal.mmp	Wed Apr 14 10:04:00 2010 +0100
@@ -23,11 +23,11 @@
 sourcepath		../../../../../../../sf/os/kernelhwsrv/halservices/hal/src
 source			hal_main.cpp userhal.cpp
 
-systeminclude		+/include ../../../../../../../sf/os/kernelhwsrv/halservices/hal/inc
-OS_LAYER_SYSTEMINCLUDE
 sourcepath		+/build/generatedcpp/hal
 source			VariantTarget(values,cpp) VariantTarget(config,cpp)
 
+OS_LAYER_SYSTEMINCLUDE
+
 library			euser.lib
 
 deffile			../../../../../../../sf/os/kernelhwsrv/halservices/hal/~/hal.def