From 7d737fcfc9a5348642ccae9be8f0e19f109bea01 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Thu, 24 Jan 2013 16:14:47 +0100
Subject: [PATCH] FOC: Make PandaBoard compile

Fix multiple definition of 'init_errata_workarounds'
---
 kernel/fiasco/src/kern/arm/cpu-arm.cpp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/kernel/fiasco/src/kern/arm/cpu-arm.cpp b/kernel/fiasco/src/kern/arm/cpu-arm.cpp
index 4267083f..ec622d3a 100644
--- a/kernel/fiasco/src/kern/arm/cpu-arm.cpp
+++ b/kernel/fiasco/src/kern/arm/cpu-arm.cpp
@@ -462,13 +462,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
@@ -507,7 +501,7 @@ Cpu::id_init()
 }
 
 //---------------------------------------------------------------------------
-IMPLEMENTATION [!arm_cpu_errata || !armv6plus]:
+IMPLEMENTATION [!arm_cpu_errata || !armv6plus || omap4_pandaboard]:
 
 PRIVATE static inline
 void Cpu::init_errata_workarounds() {}