diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-19 06:58:03 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2007-03-19 06:58:03 +0000 |
| commit | 14a0b117f13ed5455d2438bf55a7a10f092ff04e (patch) | |
| tree | 9c7cba1b195337749f8f1cb1fef898a7d18926ad /cpukit | |
| parent | 2007-03-17 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-14a0b117f13ed5455d2438bf55a7a10f092ff04e.tar.bz2 | |
2007-03-19 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/sys/conf.h: Don't include machine/conf.h.
Update copyright notice.
* libnetworking/Makefile.am: Remove machine/conf.h.
* libnetworking/machine/conf.h: Remove.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libnetworking/Makefile.am | 2 | ||||
| -rw-r--r-- | cpukit/libnetworking/machine/conf.h | 5 | ||||
| -rw-r--r-- | cpukit/libnetworking/sys/conf.h | 8 |
4 files changed, 10 insertions, 12 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 0d9c081e8a..4915ce966f 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2007-03-19 Ralf Corsépius <ralf.corsepius@rtems.org> + + * libnetworking/sys/conf.h: Don't include machine/conf.h. + Update copyright notice. + * libnetworking/Makefile.am: Remove machine/conf.h. + * libnetworking/machine/conf.h: Remove. + 2007-03-18 Ralf Corsépius <ralf.corsepius@rtems.org> * score/src/heapwalk.c: include stdlib.h. diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index d475f0de6f..48ba5dae22 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -52,7 +52,7 @@ libnetworking_a_SOURCES += kern/kern_mib.c kern/kern_subr.c \ include_machinedir = $(includedir)/machine -include_machine_HEADERS = machine/conf.h machine/cpu.h machine/cpufunc.h \ +include_machine_HEADERS = machine/cpu.h machine/cpufunc.h \ machine/endian.h machine/in_cksum.h machine/vmparam.h libnetworking_a_SOURCES += machine/limits.h diff --git a/cpukit/libnetworking/machine/conf.h b/cpukit/libnetworking/machine/conf.h deleted file mode 100644 index 2b4c47e48f..0000000000 --- a/cpukit/libnetworking/machine/conf.h +++ /dev/null @@ -1,5 +0,0 @@ -/* - * $Id$ - */ - -/* intentionally empty file */ diff --git a/cpukit/libnetworking/sys/conf.h b/cpukit/libnetworking/sys/conf.h index 5a9cacde1e..b2cad5f894 100644 --- a/cpukit/libnetworking/sys/conf.h +++ b/cpukit/libnetworking/sys/conf.h @@ -1,6 +1,8 @@ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. + * Copyright (c) 2000 + * Poul-Henning Kamp. All rights reserved. * (c) UNIX System Laboratories, Inc. * All or some portions of this file are derived from material licensed * to the University of California by American Telephone and Telegraph @@ -15,10 +17,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. @@ -200,6 +198,4 @@ int iszerodev __P((dev_t dev)); void setconf __P((void)); #endif /* _KERNEL */ -#include <machine/conf.h> - #endif /* !_SYS_CONF_H_ */ |