diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-15 22:16:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-15 22:16:50 -0700 |
| commit | a68179286f2ff5e4089626270d03688aad19191c (patch) | |
| tree | bd033b1562f5f2b093c92bd8e385dc00162bda90 /include/linux | |
| parent | 1c01cb016ae16b3afd34e0e08a1ca53d067dd143 (diff) | |
| parent | a969f91019d0c0caad4de1c60d107b9c2d9a7c69 (diff) | |
Merge http://linux-acpi.bkbits.net/linux-acpi
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index cdfbe7471df5..3d32a1b10edf 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -39,7 +39,7 @@ #include <asm/acpi.h> -#ifdef CONFIG_ACPI_BOOT +#ifdef CONFIG_ACPI enum acpi_irq_model_id { ACPI_IRQ_MODEL_PIC = 0, |