mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-08 16:11:26 +00:00
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
This commit is contained in:
1 parent
faa57a4ef4
commit
0d434f6e0b
2 files changed
+4
-4
No files matched your search
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in new issue
Block a user