summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--merge-helpers/ChangeLog4
-rwxr-xr-xmerge-helpers/check_bsp1
2 files changed, 4 insertions, 1 deletions
diff --git a/merge-helpers/ChangeLog b/merge-helpers/ChangeLog
index d6ed12e..a6c96f4 100644
--- a/merge-helpers/ChangeLog
+++ b/merge-helpers/ChangeLog
@@ -1,5 +1,9 @@
2010-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * check_bsp: Remove copied line.
+
+2010-08-18 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* check_bsp: Split check.
2010-08-08 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/merge-helpers/check_bsp b/merge-helpers/check_bsp
index e379398..c3e34de 100755
--- a/merge-helpers/check_bsp
+++ b/merge-helpers/check_bsp
@@ -92,7 +92,6 @@ if [ -r configure.ac ] ; then
echo "=== Checking for RTEMS_BSP_BOOTCARD_OPTIONS in BSP configure.ac"
test_its_there configure.ac RTEMS_BSP_BOOTCARD_OPTIONS
echo "=== Checking for RTEMS_BSP_CLEANUP_OPTIONS in BSP configure.ac"
- test_its_there configure.ac RTEMS_BSP_BOOTCARD_OPTIONS
test_its_there configure.ac RTEMS_BSP_CLEANUP_OPTIONS
fi