[API-NEXT,v1,1/1] linux-gen: fix api-next merge conflict

Message ID 1507136405-10048-2-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • linux-gen: fix api-next merge conflict
Related show

Commit Message

Github ODP bot Oct. 4, 2017, 5 p.m.
From: Maxim Uvarov <maxim.uvarov@linaro.org>


automerging of commit "052d268793"
    linux-gen: deduplicate arch-specific files
was wrong, fix it here.

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** Email created from pull request 210 (muvarov:api-next)
 ** https://github.com/Linaro/odp/pull/210
 ** Patch: https://github.com/Linaro/odp/pull/210.patch
 ** Base sha: 75cfc6f70d5b21d6f04082e1d03a7e677a895280
 ** Merge commit sha: 29cd6407208292b2fedf8e008c21713678f06e1e
 **/
 platform/linux-generic/Makefile.am | 16 ----------------
 1 file changed, 16 deletions(-)

Patch

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 8f6c65703..f6e8313bc 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -195,22 +195,6 @@  noinst_HEADERS = \
 		  ${srcdir}/include/protocols/thash.h \
 		  ${srcdir}/include/protocols/udp.h
 
-if ARCH_IS_ARM
-noinst_HEADERS += ${srcdir}/arch/arm/odp_atomic.h \
-		  ${srcdir}/arch/arm/odp_cpu.h \
-		  ${srcdir}/arch/arm/odp_cpu_idling.h \
-		  ${srcdir}/arch/arm/odp_llsc.h
-endif
-if ARCH_IS_MIPS64
-noinst_HEADERS += ${srcdir}/arch/mips64/odp_cpu.h
-endif
-if ARCH_IS_POWERPC
-noinst_HEADERS += ${srcdir}/arch/powerpc/odp_cpu.h
-endif
-if ARCH_IS_X86
-noinst_HEADERS += ${srcdir}/arch/x86/odp_cpu.h
-endif
-
 __LIB__libodp_linux_la_SOURCES = \
 			   _fdserver.c \
 			   _ishm.c \