Commit 27484da4 authored by Corey Minyard's avatar Corey Minyard Committed by Linus Torvalds

[PATCH] Fix ipmi compile failure

Geert Uytterhoeven wrote:

  While compiling drivers/char/ipmi/ipmi_si_intf.c in 2.6.6-rc1 on m68k,
  I noticed a missing include (needed for disable_irq_nosync() and
  enable_irq()):

  Furthermore none of CONFIG_ACPI_INTERPETER, CONFIG_X86, and CONFIG_PCI
  were set, and thus IPMI_MEM_ADDR_SPACE and IPMI_IO_ADDR_SPACE are not
  defined, but they are used.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 33ef0d49
...@@ -905,10 +905,10 @@ MODULE_PARM_DESC(irqs, "Sets the interrupt of each interface, the" ...@@ -905,10 +905,10 @@ MODULE_PARM_DESC(irqs, "Sets the interrupt of each interface, the"
" has an interrupt. Otherwise, set it to zero or leave" " has an interrupt. Otherwise, set it to zero or leave"
" it blank."); " it blank.");
#if defined(CONFIG_ACPI_INTERPETER) || defined(CONFIG_X86) || defined(CONFIG_PCI)
#define IPMI_MEM_ADDR_SPACE 1 #define IPMI_MEM_ADDR_SPACE 1
#define IPMI_IO_ADDR_SPACE 2 #define IPMI_IO_ADDR_SPACE 2
#if defined(CONFIG_ACPI_INTERPETER) || defined(CONFIG_X86) || defined(CONFIG_PCI)
static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr) static int is_new_interface(int intf, u8 addr_space, unsigned long base_addr)
{ {
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment