merge heads - manual merge hal.mmp
authorandy simpson <andrews@symbian.org>
Wed, 14 Apr 2010 10:04:00 +0100
changeset 33 c3f5d7eacc87
parent 32 467838f5fbab (diff)
parent 31 cf0489a7a8b1 (current diff)
child 34 161f6b2f6990
merge heads - manual merge hal.mmp
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