aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/ipmi/ipmi_si_intf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index aaf6eadaa4f9..b58e587d2990 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -1919,7 +1919,7 @@ struct SPMITable {
1919 s8 spmi_id[1]; /* A '\0' terminated array starts here. */ 1919 s8 spmi_id[1]; /* A '\0' terminated array starts here. */
1920}; 1920};
1921 1921
1922static __devinit int try_init_acpi(struct SPMITable *spmi) 1922static __devinit int try_init_spmi(struct SPMITable *spmi)
1923{ 1923{
1924 struct smi_info *info; 1924 struct smi_info *info;
1925 u8 addr_space; 1925 u8 addr_space;
@@ -1940,7 +1940,7 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
1940 return -ENOMEM; 1940 return -ENOMEM;
1941 } 1941 }
1942 1942
1943 info->addr_source = "ACPI"; 1943 info->addr_source = "SPMI";
1944 1944
1945 /* Figure out the interface type. */ 1945 /* Figure out the interface type. */
1946 switch (spmi->InterfaceType) { 1946 switch (spmi->InterfaceType) {
@@ -2002,7 +2002,7 @@ static __devinit int try_init_acpi(struct SPMITable *spmi)
2002 return 0; 2002 return 0;
2003} 2003}
2004 2004
2005static __devinit void acpi_find_bmc(void) 2005static __devinit void spmi_find_bmc(void)
2006{ 2006{
2007 acpi_status status; 2007 acpi_status status;
2008 struct SPMITable *spmi; 2008 struct SPMITable *spmi;
@@ -2020,7 +2020,7 @@ static __devinit void acpi_find_bmc(void)
2020 if (status != AE_OK) 2020 if (status != AE_OK)
2021 return; 2021 return;
2022 2022
2023 try_init_acpi(spmi); 2023 try_init_spmi(spmi);
2024 } 2024 }
2025} 2025}
2026#endif 2026#endif
@@ -3104,7 +3104,7 @@ static __devinit int init_ipmi_si(void)
3104#endif 3104#endif
3105 3105
3106#ifdef CONFIG_ACPI 3106#ifdef CONFIG_ACPI
3107 acpi_find_bmc(); 3107 spmi_find_bmc();
3108#endif 3108#endif
3109 3109
3110#ifdef CONFIG_PCI 3110#ifdef CONFIG_PCI