diff --git a/kernel/fiasco/src/kern/arm/cpu-arm.cpp b/kernel/fiasco/src/kern/arm/cpu-arm.cpp
index 13b8c6d9..dd222ba3 100644
--- a/kernel/fiasco/src/kern/arm/cpu-arm.cpp
+++ b/kernel/fiasco/src/kern/arm/cpu-arm.cpp
@@ -459,13 +459,7 @@ Cpu::id_init()
 }
 
 //---------------------------------------------------------------------------
-IMPLEMENTATION [arm && armv6plus && omap4_pandaboard]:
-
-PRIVATE static inline
-void Cpu::init_errata_workarounds() {}
-
-//---------------------------------------------------------------------------
-IMPLEMENTATION [arm && armv6plus && !omap4_pandaboard]:
+IMPLEMENTATION [arm && armv6plus]:
 
 PRIVATE static inline
 void
@@ -504,7 +498,7 @@ Cpu::id_init()
 }
 
 //---------------------------------------------------------------------------
-IMPLEMENTATION [!arm_cpu_errata || !armv6plus]:
+IMPLEMENTATION [!arm_cpu_errata || !armv6plus || omap4_pandaboard]:
 
 PRIVATE static inline
 void Cpu::init_errata_workarounds() {}