diff options
| author | Matt Domsch <Matt_Domsch@dell.com> | 2006-01-11 12:17:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 18:42:13 -0800 |
| commit | a9fad4cc3975573a359a92ad047f5995d8391631 (patch) | |
| tree | 7400df3c7b19869e350c90f6579062f8a5369e58 /drivers/char/ipmi | |
| parent | 5c908a74d90e693d9079f4238012d43b06231a70 (diff) | |
| download | linux-a9fad4cc3975573a359a92ad047f5995d8391631.tar.gz linux-a9fad4cc3975573a359a92ad047f5995d8391631.tar.bz2 linux-a9fad4cc3975573a359a92ad047f5995d8391631.zip | |
[PATCH] ipmi: use CONFIG_DMI instead of CONFIG_X86
With Andi Kleen's x86_64 patch to use DMI, and my ia64 to use DMI, there is
now a new CONFIG_DMI option which takes the place of CONFIG_X86 to denote
the availability of the DMI functions. Make the IPMI driver use CONFIG_DMI
instead.
Tested on ia64 2.6.15 kernel plus the previous patch, on a Dell PowerEdge
7250 Itanium2 server, and it now autodetects the IPMI KCS driver as
expected.
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Acked-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_si_intf.c | 10 |
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 beea450ee4b2..c67ef3e47ad5 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -1056,7 +1056,7 @@ MODULE_PARM_DESC(slave_addrs, "Set the default IPMB slave address for" #define IPMI_MEM_ADDR_SPACE 1 #define IPMI_IO_ADDR_SPACE 2 -#if defined(CONFIG_ACPI) || defined(CONFIG_X86) || defined(CONFIG_PCI) +#if defined(CONFIG_ACPI) || defined(CONFIG_DMI) || defined(CONFIG_PCI) static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) { int i; @@ -1669,7 +1669,7 @@ static int try_init_acpi(int intf_num, struct smi_info **new_info) } #endif -#ifdef CONFIG_X86 +#ifdef CONFIG_DMI typedef struct dmi_ipmi_data { u8 type; @@ -1829,7 +1829,7 @@ static int try_init_smbios(int intf_num, struct smi_info **new_info) ipmi_data->slave_addr); return 0; } -#endif /* CONFIG_X86 */ +#endif /* CONFIG_DMI */ #ifdef CONFIG_PCI @@ -2222,7 +2222,7 @@ static int init_one_smi(int intf_num, struct smi_info **smi) if (rv && si_trydefaults) rv = try_init_acpi(intf_num, &new_smi); #endif -#ifdef CONFIG_X86 +#ifdef CONFIG_DMI if (rv && si_trydefaults) rv = try_init_smbios(intf_num, &new_smi); #endif @@ -2433,7 +2433,7 @@ static __init int init_ipmi_si(void) printk(KERN_INFO "IPMI System Interface driver.\n"); -#ifdef CONFIG_X86 +#ifdef CONFIG_DMI dmi_find_bmc(); #endif |