merged cpu and mem sensors code

[psensor.git] / src / lib / psensor.c

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index fb30352..1efff09 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -28,11 +28,6 @@
 #include <lmsensor.h>
 #include <temperature.h>
 
-#ifdef HAVE_GTOP
-#include <cpu.h>
-#include <pmem.h>
-#endif
-
 struct psensor *psensor_create(char *id,
                               char *name,
                               char *chip,
@@ -441,10 +436,6 @@ struct psensor **get_all_sensors(int use_libatasmart, int values_max_length)
                }
 #endif
 
-#ifdef HAVE_GTOP
-       mem_psensor_list_add(&psensors, values_max_length);
-#endif
-
        if (!psensors) {        /* there is no detected sensors */
                psensors = malloc(sizeof(struct psensor *));
                *psensors = NULL;
@@ -522,11 +513,6 @@ void psensor_list_update_measures(struct psensor **sensors)
 {
        lmsensor_psensor_list_update(sensors);
 
-#ifdef HAVE_GTOP
-       cpu_psensor_list_update(sensors);
-       mem_psensor_list_update(sensors);
-#endif
-
        if (psensor_list_contains_type(sensors, SENSOR_TYPE_HDDTEMP))
                hddtemp_psensor_list_update(sensors);