# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1255101350 -3600
# Node ID b277c89230a2ba8f73197bfd05ea59b4831307d3
# Parent  eff84413e53a80ae4dbf5c6494850afa56922485
Tweaks to remove Symbian^2 workarounds which break on Symbian^3

diff -r eff84413e53a -r b277c89230a2 omap3530/assp/inc/omap3530_asspreg.h
--- a/omap3530/assp/inc/omap3530_asspreg.h	Fri Oct 09 16:14:48 2009 +0100
+++ b/omap3530/assp/inc/omap3530_asspreg.h	Fri Oct 09 16:15:50 2009 +0100
@@ -13,6 +13,8 @@
 // Description:
 //
 
+#if 0 // not needed for Symbian^3
+
 #ifndef __ASSPREG_H__
 #define __ASSPREG_H__
 
@@ -156,3 +158,4 @@
 	};
 
 #endif
+#endif
diff -r eff84413e53a -r b277c89230a2 omap3530/omap3530_drivers/i2c/i2c.cpp
--- a/omap3530/omap3530_drivers/i2c/i2c.cpp	Fri Oct 09 16:14:48 2009 +0100
+++ b/omap3530/omap3530_drivers/i2c/i2c.cpp	Fri Oct 09 16:15:50 2009 +0100
@@ -537,7 +537,7 @@
 	}
 
 TUnitControl::TUnitControl() :
-	iLock(/*TSpinLock::EOrderGenericIrqLow1*/),
+	iLock(TSpinLock::EOrderGenericIrqLow1),
 	iDfc(TheDfc, 0, 1),
 	iNumDevices(0),
 	iTransferQ(0)