From 0d434f6e0b3a1cc0ba6b43832ce9e862eac11d25 Mon Sep 17 00:00:00 2001
From: "Mark D. Studebaker" <mdsxyz123@yahoo.com>
Date: Sat, 21 Sep 2002 20:30:05 +0000
Subject: [PATCH] rename dmi_scan_machine() to dmi_scan_mach() to avoid
 collision       with kernel - ticket #1002

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1541 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 kernel/busses/dmi_scan.c  | 4 ++--
 kernel/busses/i2c-piix4.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/busses/dmi_scan.c b/kernel/busses/dmi_scan.c
index 60e03e22..9e10e3ab 100644
--- a/kernel/busses/dmi_scan.c
+++ b/kernel/busses/dmi_scan.c
@@ -220,7 +220,7 @@ static void __init dmi_decode(struct dmi_header *dm)
 	}
 }
 
-void __init dmi_scan_machine(void)
+void __init dmi_scan_mach(void)
 {
 	int err;
 	printk("dmi_scan.o version %s (%s)\n", LM_VERSION, LM_DATE);
@@ -237,7 +237,7 @@ MODULE_DESCRIPTION("SM BIOS DMI Scanner");
 MODULE_LICENSE("GPL");
 #endif
 EXPORT_SYMBOL(dmi_ident);
-EXPORT_SYMBOL(dmi_scan_machine);
+EXPORT_SYMBOL(dmi_scan_mach);
 int init_module(void)
 {
 	return 0;
diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c
index 659c7766..6187c7d1 100644
--- a/kernel/busses/i2c-piix4.c
+++ b/kernel/busses/i2c-piix4.c
@@ -187,7 +187,7 @@ static unsigned short piix4_smba = 0;
  * Get DMI information.
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,34)
-void dmi_scan_machine(void);
+void dmi_scan_mach(void);
 #endif
 static int __init ibm_dmi_probe(void)
 {
@@ -196,7 +196,7 @@ static int __init ibm_dmi_probe(void)
 	return is_unsafe_smbus;
 #else
 #define IBM_SIGNATURE		"IBM"
-	dmi_scan_machine();
+	dmi_scan_mach();
 	if(dmi_ident[DMI_SYS_VENDOR] == NULL)
 		return 0;
 	if(strncmp(dmi_ident[DMI_SYS_VENDOR], IBM_SIGNATURE,