From b9831fbfcd9b069f3edbd415de62778e0537312b Mon Sep 17 00:00:00 2001
From: Frodo Looijaard <frodol@dds.nl>
Date: Wed, 1 Dec 1999 00:57:44 +0000
Subject: [PATCH] Fixed the strange compile problems some people had

Reasons varied from typos (_ instead of -) to static declarations that
should have been extern.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@646 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 kernel/busses/i2c-hydra.c | 4 ++--
 kernel/busses/i2c-via.c   | 4 ++--
 kernel/chips/gl518sm.c    | 6 +++---
 kernel/chips/lm80.c       | 7 ++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/kernel/busses/i2c-hydra.c b/kernel/busses/i2c-hydra.c
index e5200f69..e0254cf8 100644
--- a/kernel/busses/i2c-hydra.c
+++ b/kernel/busses/i2c-hydra.c
@@ -185,7 +185,7 @@ static
 #else
 extern
 #endif
-       int __init i2c_init_i2c_hydra(void)
+       int __init i2c_init_hydra(void)
 {
 	if (find_hydra() < 0) {
 		printk("Error while reading PCI configuration\n");
@@ -212,7 +212,7 @@ MODULE_DESCRIPTION("i2c for Apple Hydra Mac I/O");
 
 int init_module(void) 
 {
-	return i2c_init_i2c_hydra();
+	return i2c_init_hydra();
 }
 
 void cleanup_module(void) 
diff --git a/kernel/busses/i2c-via.c b/kernel/busses/i2c-via.c
index b4728ac8..271dd46b 100644
--- a/kernel/busses/i2c-via.c
+++ b/kernel/busses/i2c-via.c
@@ -216,7 +216,7 @@ static
 #else
 extern
 #endif
-       int __init i2c_init_i2c_via(void)
+       int __init i2c_init_via(void)
 {
 	if (find_via() < 0) {
 		printk("Error while reading PCI configuration\n");
@@ -252,7 +252,7 @@ MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
 
 int init_module(void) 
 {
-	return i2c_init_i2c_via();
+	return i2c_init_via();
 }
 
 void cleanup_module(void) 
diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c
index 678229db..06c9b28d 100644
--- a/kernel/chips/gl518sm.c
+++ b/kernel/chips/gl518sm.c
@@ -192,7 +192,7 @@ static
 #else
 extern
 #endif
-       int __init sensors_gl518_init(void);
+       int __init sensors_gl518sm_init(void);
 static int __init gl518_cleanup(void);
 static int gl518_attach_adapter(struct i2c_adapter *adapter);
 static int gl518_detect(struct i2c_adapter *adapter, int address, 
@@ -1023,7 +1023,7 @@ void gl518_iterate(struct i2c_client *client, int operation, int ctl_name,
   }
 }
 
-int __init sensors_gl518_init(void)
+int __init sensors_gl518sm_init(void)
 {
   int res;
 
@@ -1062,7 +1062,7 @@ MODULE_DESCRIPTION("GL518SM driver");
 
 int init_module(void)
 {
-  return sensors_gl518_init();
+  return sensors_gl518sm_init();
 }
 
 int cleanup_module(void)
diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c
index 611bfb77..c93eba03 100644
--- a/kernel/chips/lm80.c
+++ b/kernel/chips/lm80.c
@@ -200,7 +200,12 @@ struct lm80_data {
 };
 
 
-static int __init sensors_lm80_init(void);
+#ifdef MODULE
+static
+#else
+extern
+#endif
+       int __init sensors_lm80_init(void);
 static int __init lm80_cleanup(void);
 
 static int lm80_attach_adapter(struct i2c_adapter *adapter);