3 files changed, 3 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 935d9f93c8b..cd5c96cf36e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
 2012-06-12  Glenn Morris  <rgm@gnu.org>
 
-        * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h: Remove files.
+        * s/gnu-kfreebsd.h, s/hpux11.h, s/openbsd.h, s/sol2-10.h: Remove files.
+
+        * s/gnu-linux.h (HAVE_PROCFS): Move to configure.
 
         * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
         Move BROKEN_SIGIO to configure.
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 20ce65207a1..e3d43249d81 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -81,9 +81,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define HAVE_SOCKETS
 
-/* This is used in list_system_processes.  */
-#define HAVE_PROCFS 1
-
 /* Define CLASH_DETECTION if you want lock files to be written
    so that Emacs can tell instantly when you try to modify
    a file that someone else has modified in his Emacs.  */
diff --git a/src/s/sol2-10.h b/src/s/sol2-10.h
deleted file mode 100644
index b20476e7fba..00000000000
--- a/src/s/sol2-10.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Handle Solaris 2.10.  */
-
-#include "sol2-6.h"
-
-/* This is used in list_system_processes.  */
-#define HAVE_PROCFS 1
-
-/* This is needed for the system_process_attributes implementation.  */
-#define _STRUCTURED_PROC 1
-