From 2c5441a2dbc6b70f588b8d2a3d6291f47b902f93 Mon Sep 17 00:00:00 2001 From: "Mark M. Hoffman" Date: Sun, 18 Sep 2005 18:28:51 +0000 Subject: [PATCH] (mmh) This patch moves the chip and bus lists from lib/proc.c to lib/data.c. The variables were already declared in lib/data.h. Motivation: when support for kernel 2.4.x becomes optional, lib/proc.c may not even be compiled into the library... but these variables are still needed. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3090 7894878c-1315-0410-8ee3-d5d059ff63e0 --- lib/data.c | 8 ++++++++ lib/proc.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/data.c b/lib/data.c index 4553c8c5..5038f2e7 100644 --- a/lib/data.c +++ b/lib/data.c @@ -36,6 +36,14 @@ sensors_bus *sensors_config_busses = NULL; int sensors_config_busses_count = 0; int sensors_config_busses_max = 0; +sensors_proc_chips_entry *sensors_proc_chips = NULL; +int sensors_proc_chips_count = 0; +int sensors_proc_chips_max = 0; + +sensors_bus *sensors_proc_bus = NULL; +int sensors_proc_bus_count = 0; +int sensors_proc_bus_max = 0; + static int sensors_substitute_chip(sensors_chip_name *name,int lineno); /* Wow, this must be one of the ugliest functions I have ever written. diff --git a/lib/proc.c b/lib/proc.c index 2a78993f..898ab2d0 100644 --- a/lib/proc.c +++ b/lib/proc.c @@ -40,12 +40,6 @@ static char buf[BUF_LEN]; -sensors_proc_chips_entry *sensors_proc_chips; -int sensors_proc_chips_count, sensors_proc_chips_max; - -sensors_bus *sensors_proc_bus; -int sensors_proc_bus_count, sensors_proc_bus_max; - static int sensors_get_chip_id(sensors_chip_name name); int foundsysfs=0;