# HG changeset patch
# User Tom Pritchard tomp@symbian.org
# Date 1284058121 -3600
# Node ID 52c8fa16282d700bd9a40f421430d16b4eb2f86d
# Parent  8cf16be5c3dd2306d0c8907ff7f1e9d04d65a807
Correcting 'merge' issue identified at changeset 61 - 4132b3bda717.
Due to an incorrect merge , some of the changes pushed with changeset 52 - d2416cb47e12 on the default branch were left behind.

diff -r 8cf16be5c3dd -r 52c8fa16282d omap3530/beagleboard/rom/base_beagle.iby
--- a/omap3530/beagleboard/rom/base_beagle.iby	Tue Sep 07 08:40:04 2010 +0100
+++ b/omap3530/beagleboard/rom/base_beagle.iby	Thu Sep 09 19:48:41 2010 +0100
@@ -115,7 +115,6 @@
 	// Use the new GCE compliant display driver  
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_beagle_lcd_gce.dll	\sys\bin\lcd.dll
 	device[VARID]=KERNEL_DIR\DEBUG_DIR\display.ldd			\sys\bin\display0.ldd
-	#file=ABI_DIR\DEBUG_DIR\_beagle_ekdata.dll				\sys\bin\ekdata.dll
 	extension[VARID]=\epoc32\release\ARMV5\BUILD_DIR\_omap3530_serialkeyboard_uisoftkeys.dll	\sys\bin\ekeyb.dll
 #else
 	#ifdef TSHELL_SERIAL
diff -r 8cf16be5c3dd -r 52c8fa16282d omap3530/beagleboard/rom/kernel.iby
--- a/omap3530/beagleboard/rom/kernel.iby	Tue Sep 07 08:40:04 2010 +0100
+++ b/omap3530/beagleboard/rom/kernel.iby	Thu Sep 09 19:48:41 2010 +0100
@@ -47,6 +47,8 @@
 
 #include <rom/omapshared/tps65950.iby>
 
+device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\_omap3530_EUART.PDD				\sys\bin\euart.pdd
+device[VARID]=\Epoc32\Release\ARMV5\##BUILD##\ECOMM.LDD						\sys\bin\ecomm.ldd
 #ifdef TSHELL_SERIAL
 	//Use VT100 Over Serial
 #	define EDISP_DRV	\EDISP_VT100.DLL