From 8d0bc199dfc6fadc18f0f0ee8d45d5eae109a8f0 Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Fri, 10 Feb 2012 18:09:19 +0000
Subject: [PATCH] hwloc131_module.c isn't necessary -- there's no module.

This commit was SVN r25901.
---
 opal/mca/hwloc/hwloc131/Makefile.am          |  2 +-
 opal/mca/hwloc/hwloc131/hwloc131_component.c | 14 +------
 opal/mca/hwloc/hwloc131/hwloc131_module.c    | 44 --------------------
 3 files changed, 2 insertions(+), 58 deletions(-)
 delete mode 100644 opal/mca/hwloc/hwloc131/hwloc131_module.c

diff --git a/opal/mca/hwloc/hwloc131/Makefile.am b/opal/mca/hwloc/hwloc131/Makefile.am
index 58444fe213..1cfa2e9d66 100644
--- a/opal/mca/hwloc/hwloc131/Makefile.am
+++ b/opal/mca/hwloc/hwloc131/Makefile.am
@@ -18,7 +18,7 @@ SUBDIRS = hwloc
 
 # Headers and sources
 headers = hwloc131.h
-sources = hwloc131_component.c hwloc131_module.c
+sources = hwloc131_component.c
 
 # We only ever build this component statically
 noinst_LTLIBRARIES = libmca_hwloc_hwloc131.la
diff --git a/opal/mca/hwloc/hwloc131/hwloc131_component.c b/opal/mca/hwloc/hwloc131/hwloc131_component.c
index c9932732fb..94812b9f48 100644
--- a/opal/mca/hwloc/hwloc131/hwloc131_component.c
+++ b/opal/mca/hwloc/hwloc131/hwloc131_component.c
@@ -26,11 +26,6 @@
 const char *opal_hwloc_hwloc131_component_version_string =
     "OPAL hwloc131 hwloc MCA component version " OPAL_VERSION;
 
-/*
- * Local function
- */
-static int hwloc131_open(void);
-
 /*
  * Instantiate the public struct with all of our public information
  * and pointers to our public functions in it
@@ -51,7 +46,7 @@ const opal_hwloc_component_t mca_hwloc_hwloc131_component = {
         OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
-        hwloc131_open,
+        NULL,
         NULL
     },
     {
@@ -59,10 +54,3 @@ const opal_hwloc_component_t mca_hwloc_hwloc131_component = {
         MCA_BASE_METADATA_PARAM_CHECKPOINT
     }
 };
-
-
-static int hwloc131_open(void)
-{    
-    return OPAL_SUCCESS;
-}
-
diff --git a/opal/mca/hwloc/hwloc131/hwloc131_module.c b/opal/mca/hwloc/hwloc131/hwloc131_module.c
deleted file mode 100644
index 924c567fae..0000000000
--- a/opal/mca/hwloc/hwloc131/hwloc131_module.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
- */
-#include "opal_config.h"
-#include "opal/constants.h"
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#include <sys/queue.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef WIN32
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#endif
-#include <errno.h>
-#include <signal.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-
-#include "opal/class/opal_object.h"
-#include "opal/threads/mutex.h"
-#include "opal/threads/threads.h"
-#include "opal/util/output.h"
-#include "opal/util/argv.h"
-#include "opal/util/fd.h"
-#include "opal/mca/base/mca_base_param.h"
-
-#include "hwloc131.h"
-#include "opal/mca/hwloc/base/base.h"
-