diff --git a/CHANGES b/CHANGES index f7c0a8a6..163d4bf3 100644 --- a/CHANGES +++ b/CHANGES @@ -31,8 +31,12 @@ ask CVS about it: Module adm1025: Fixed temp2 min/max writes Module ds1621: Add 12-bit precision mode Module it87: Enable all alarms, add in8 support, add sensor type selection + Module sensors: Don't initialize i2c-proc (moved to i2c-core); + remove support for module Module sis5595: Recognize unsupported chips and refuse to load Module w83781d: Fix fan speed for as99127f (broken by 2.6.0) + Program mkpatch.pl: Fix dependencies on i2c-proc; disallow compilation + of sensors.c as a module in kernel Program sensors: it87 updates Program sensors-detect: Fix ADM1024 and ADM1025 detection; recognize unsupported SiS chips; diff --git a/kernel/sensors.c b/kernel/sensors.c index 6d9bc8ab..6bf2af3a 100644 --- a/kernel/sensors.c +++ b/kernel/sensors.c @@ -18,29 +18,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* Not configurable as a module */ #include -#ifdef MODULE -extern int init_module(void); -extern int cleanup_module(void); -#endif /* MODULE */ - -#ifdef MODULE - - -int init_module(void) -{ - return 0; -} - -int cleanup_module(void) -{ - return 0; -} - -#else /* ndef MODULE */ - #ifdef CONFIG_SENSORS_ADM1021 extern int sensors_adm1021_init(void); #endif @@ -104,7 +85,6 @@ extern int sensors_it87_init(void); int __init sensors_init_all(void) { - sensors_init(); #ifdef CONFIG_SENSORS_ADM1021 sensors_adm1021_init(); #endif @@ -167,5 +147,3 @@ int __init sensors_init_all(void) #endif return 0; } - -#endif /* MODULE */