Fixed merge conflict

This commit is contained in:
Stefan Hepp
2014-03-18 15:10:05 +01:00
parent 1c1b68be2f
commit e4358226c4

View File

@@ -13,11 +13,6 @@
/* XXX these need to be addressed */
void _CPU_cache_invalidate_entire_instruction ( void )
{
<<<<<<< HEAD
=======
// No flush instruction at the moment
//asm volatile ("flush");
>>>>>>> 0524f11f213c4b1a72cf113f24422977a9bae877
}
void _CPU_cache_freeze_instruction ( void )