From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 14 Feb 2015 23:00:19 -0600
Subject: resolve merge

---
 libpthread/linuxthreads/sysdeps/ia64/tls.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libpthread/linuxthreads/sysdeps/ia64/tls.h')

diff --git a/libpthread/linuxthreads/sysdeps/ia64/tls.h b/libpthread/linuxthreads/sysdeps/ia64/tls.h
index c86073f26..a78f0ec7a 100644
--- a/libpthread/linuxthreads/sysdeps/ia64/tls.h
+++ b/libpthread/linuxthreads/sysdeps/ia64/tls.h
@@ -111,9 +111,6 @@ typedef struct
 
 # define TLS_MULTIPLE_THREADS_IN_TCB 1
 
-/* Get the thread descriptor definition.  */
-#  include <linuxthreads/descr.h>
-
 # endif
 
 #else
@@ -128,9 +125,6 @@ typedef struct
   int multiple_threads;
 } tcbhead_t;
 
-/* Get the thread descriptor definition.  */
-#  include <linuxthreads/descr.h>
-
 #  define NONTLS_INIT_TP \
   do { 									\
     static const tcbhead_t nontls_init_tp = { .multiple_threads = 0 };	\
-- 
cgit v1.2.3