summaryrefslogtreecommitdiffstats
path: root/doc/bsp_howto
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--doc/bsp_howto/ChangeLog4
-rw-r--r--doc/bsp_howto/Makefile.am3
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/bsp_howto/ChangeLog b/doc/bsp_howto/ChangeLog
index 3bba4cc238..631bb48784 100644
--- a/doc/bsp_howto/ChangeLog
+++ b/doc/bsp_howto/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Merger from rtems-4-6-branch.
+
2003-09-19 Joel Sherrill <joel@OARcorp.com>
* analog.t, bsp_howto.texi, discrete.t, nvmem.t, target.t: Merge from
diff --git a/doc/bsp_howto/Makefile.am b/doc/bsp_howto/Makefile.am
index f26d93ffc5..b5b99ddf04 100644
--- a/doc/bsp_howto/Makefile.am
+++ b/doc/bsp_howto/Makefile.am
@@ -18,8 +18,7 @@ GENERATED_FILES = intro.texi target.texi makefiles.texi linkcmds.texi \
rtc.texi ata.texi ide-ctrl.texi nvmem.texi network.texi shmsupp.texi \
analog.texi discrete.texi
-COMMON_FILES = $(top_srcdir)/common/setup.texi \
- $(top_srcdir)/common/cpright.texi
+COMMON_FILES += $(top_srcdir)/common/cpright.texi
FILES =