# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1280485030 -3600
# Node ID 23f868c54bc5c07e8a3060c9cd21152e9326237f
# Parent  deed9c658f7034c439a391778c32a3a00cee7145
Repair the lcd.mmp and lcd_gce.mmp situation to build both versions of the lcd driver
- Change 78c240f59c9d wrongly changed the purpose of lcd.mmp, but the lcd_gce.mmp file wasn't present in the parent revision.
- This change uses lcd.mmp to do all the work, and lcd_gce.mmp just defines the macro and #includes lcd.mmp

diff -r deed9c658f70 -r 23f868c54bc5 omap3530/beagle_drivers/lcd/lcd.mmp
--- a/omap3530/beagle_drivers/lcd/lcd.mmp	Tue Jul 27 15:37:38 2010 +0100
+++ b/omap3530/beagle_drivers/lcd/lcd.mmp	Fri Jul 30 11:17:10 2010 +0100
@@ -26,8 +26,6 @@
 #include			"beagle/variant.mmh"
 #include			"kernel/kern_ext.mmh"
 
-//Need to define NGA_BUILD for a NGA compliant Display PDD
-#define NGA_BUILD
 #ifdef NGA_BUILD
 MACRO ENABLE_GCE_MODE
 target				VariantTarget(lcd_gce,dll)
diff -r deed9c658f70 -r 23f868c54bc5 omap3530/beagle_drivers/lcd/lcd_gce.mmp
--- a/omap3530/beagle_drivers/lcd/lcd_gce.mmp	Tue Jul 27 15:37:38 2010 +0100
+++ b/omap3530/beagle_drivers/lcd/lcd_gce.mmp	Fri Jul 30 11:17:10 2010 +0100
@@ -15,44 +15,6 @@
 // lcd.dll Beagle LCD driver
 //
 
-
-
-/**
- @file
-*/
-#define __USING_ASSP_REGISTER_API__
-#define __USING_ASSP_INTERRUPT_API__
-
-#include			"beagle/variant.mmh"
-#include			"kernel/kern_ext.mmh"
-
 //Need to define NGA_BUILD for a NGA compliant Display PDD
 #define NGA_BUILD
-#ifdef NGA_BUILD
-MACRO ENABLE_GCE_MODE
-target				VariantTarget(lcd_gce,dll)
-#else
-target				VariantTarget(lcd,dll)
-#endif
-
-targettype			kext
-romtarget			lcd.dll
-
-sourcepath			.
-source				lcd.cpp
-
-SYMBIAN_BASE_SYSTEMINCLUDE(drivers)
-userinclude			.
-
-library			VariantTarget(ecust,lib)
-LIBRARY         AsspTarget(prcm,lib)
-
-noexportlibrary
-
-epocallowdlldata
-
-uid					0x1000008d 0x100039e8
-
-VENDORID 0x70000001
-
-capability			all
+#include "lcd.mmp"