summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-03-11 11:47:17 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-03-11 11:47:17 +0000
commitec0a3462b0b55696c98fe159e5beefce823eb0db (patch)
tree9e0cc2d2c42ee428179b1daf2d50e1838a112129 /cpukit
parentMerger from rtems-4-6-branch. (diff)
downloadrtems-ec0a3462b0b55696c98fe159e5beefce823eb0db.tar.bz2
Merger from rtems-4-6-branch.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libnetworking/ChangeLog9
-rw-r--r--cpukit/libnetworking/configure.ac1
-rw-r--r--cpukit/libnetworking/netinet/in_cksum.c4
3 files changed, 9 insertions, 5 deletions
diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog
index 1cacacac2d..b2d02cd061 100644
--- a/cpukit/libnetworking/ChangeLog
+++ b/cpukit/libnetworking/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove AC_CONFIG_AUX_DIR.
+
+2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * netinet/in_chksum.c: Remove duplicate case to include
+ in_chksum_arm.c.
+
2003-02-20 Till Straumann <strauman@slac.stanford.edu>
PR 351/networking
diff --git a/cpukit/libnetworking/configure.ac b/cpukit/libnetworking/configure.ac
index 92bf9d0ac3..145dd1e0de 100644
--- a/cpukit/libnetworking/configure.ac
+++ b/cpukit/libnetworking/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
AC_INIT([rtems-cpukit-libnetworking],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([arpa])
RTEMS_TOP(../..)
-AC_CONFIG_AUX_DIR(../..)
RTEMS_CANONICAL_TARGET_CPU
diff --git a/cpukit/libnetworking/netinet/in_cksum.c b/cpukit/libnetworking/netinet/in_cksum.c
index 7666557dde..2ce4dc68b6 100644
--- a/cpukit/libnetworking/netinet/in_cksum.c
+++ b/cpukit/libnetworking/netinet/in_cksum.c
@@ -57,10 +57,6 @@
#include "in_cksum_powerpc.c"
-#elif (defined(__GNUC__) && defined(__arm__))
-
-#include "in_cksum_arm.c"
-
#else
#include <stdio.h> /* for puts */