alex/foc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FOC: Make PandaBoard compile

Browse Source 
Fix multiple definition of 'init_errata_workarounds'
This commit is contained in:
Sebastian Sumpf
2013-01-24 16:14:47 +01:00
parent 9a8ee69042
commit 7d737fcfc9
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/fiasco/src/kern/arm/cpu-arm.cpp
View File

@@ -462,13 +462,7 @@ Cpu::id_init()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
IMPLEMENTATION [arm && armv6plus && omap4_pandaboard]: IMPLEMENTATION [arm && armv6plus]:
PRIVATE static inline
void Cpu::init_errata_workarounds() {}
//---------------------------------------------------------------------------
IMPLEMENTATION [arm && armv6plus && !omap4_pandaboard]:
PRIVATE static inline PRIVATE static inline
void void
@@ -507,7 +501,7 @@ Cpu::id_init()
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
IMPLEMENTATION [!arm_cpu_errata || !armv6plus]: IMPLEMENTATION [!arm_cpu_errata || !armv6plus || omap4_pandaboard]:
PRIVATE static inline PRIVATE static inline
void Cpu::init_errata_workarounds() {} void Cpu::init_errata_workarounds() {}