[rtems commit] config: Fix re-definition warning

[Sebastian Huber]

Module:    rtems
Branch:    master
Commit:    2c65588862b2ea77563dbc75902943f0d26e30d6
Changeset: http://git.rtems.org/rtems/commit/?id=2c65588862b2ea77563dbc75902943f0d26e30d6

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Thu Mar 22 07:48:05 2018 +0100

config: Fix re-definition warning

---

 cpukit/include/rtems/confdefs.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/cpukit/include/rtems/confdefs.h b/cpukit/include/rtems/confdefs.h
index 9c83691..91839ff 100755
--- a/cpukit/include/rtems/confdefs.h
+++ b/cpukit/include/rtems/confdefs.h
@@ -1830,15 +1830,6 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
   #define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0
 #endif
 
-/**
- * This defines the timers required for the shared memory driver in
- * a multiprocessing configuration.
- */
-#ifndef _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER
-  #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
-#endif
-
-
 #if defined(RTEMS_MULTIPROCESSING)
   /*
    *  Default Multiprocessing Configuration Table.  The defaults are
@@ -1896,15 +1887,13 @@ extern rtems_initialization_tasks_table Initialization_tasks[];
       #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 1
 
     #endif /* CONFIGURE_HAS_OWN_MULTIPROCESSING_TABLE */
-
   #else
-
-    #define CONFIGURE_MULTIPROCESSING_TABLE    NULL
-
+    #define CONFIGURE_MULTIPROCESSING_TABLE NULL
+    #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
     #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
-
   #endif /* CONFIGURE_MP_APPLICATION */
 #else
+  #define _CONFIGURE_TIMER_FOR_SHARED_MEMORY_DRIVER 0
   #define _CONFIGURE_MPCI_RECEIVE_SERVER_COUNT 0
 #endif /* RTEMS_MULTIPROCESSING */
 /**@}*/ /* end of Multiprocessing Configuration */