After fixing an svn/hg kerfluffle, there's a few files left over from

last night's hwloc/paffinity/maffinity minor update.  Nothing huge;
just a little cleanup.

This commit was SVN r25202.

opal/mca/maffinity/base/base.h

@@ -156,11 +156,6 @@ OPAL_DECLSPEC extern opal_list_t opal_maffinity_base_components_opened;
  */
 extern int opal_maffinity_base_output;
 
-/**
- * Flag to indicate whether or not maffinity was setup
- */
-OPAL_DECLSPEC extern bool opal_maffinity_setup;
-
 END_C_DECLS
     
 #endif /* OPAL_MAFFINITY_BASE_H */

opal/mca/maffinity/base/maffinity_base_open.c

@@ -52,7 +52,6 @@
 int opal_maffinity_base_output = -1;
 bool opal_maffinity_base_components_opened_valid = false;
 opal_list_t opal_maffinity_base_components_opened;
-bool opal_maffinity_setup = false;
 
 /*
  * Function for finding and opening either all MCA components, or the one

opal/mca/maffinity/hwloc/maffinity_hwloc_module.c

@@ -35,7 +35,7 @@
 #include "opal/mca/maffinity/base/base.h"
 #include "opal/mca/hwloc/base/base.h"
 #include "maffinity_hwloc.h"
-#include "opal/mca/hwloc/hwloc.h"
+#include "opal/mca/hwloc/base/base.h"
 
 /*
  * Local functions
@@ -123,8 +123,7 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments,
         hwloc_bitmap_free(cpuset);
     }
     if (OPAL_SUCCESS != rc) {
-        return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
+        return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, msg, rc);
-                                                   msg, rc);
     }
     return OPAL_SUCCESS;
 }
@@ -176,8 +175,7 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs,
         hwloc_bitmap_free(cpuset);
     }
     if (OPAL_SUCCESS != rc) {
-        return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
+        return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__, msg, rc);
-                                                   msg, rc);
     }
     return OPAL_SUCCESS;
 }

opal/mca/paffinity/hwloc/configure.m4

@@ -10,7 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
-# Copyright (c) 2007-2010 Cisco Systems, Inc. All rights reserved.
+# Copyright (c) 2007-2011 Cisco Systems, Inc.  All rights reserved.
 #
 # $COPYRIGHT$
 #