diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:25:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-11 21:25:44 -0500 |
| commit | e947382ed38563544d2b5b79f6ea90bdde350e5e (patch) | |
| tree | b09380b54bc2ef3841e6568fbf98fbb8f7706de8 /include/linux | |
| parent | 5b94d541806da24c8dbbff629486d65ce71dec46 (diff) | |
| parent | d2fadbbbf0e42b842731da71864f222e7f119461 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
Revert "ACPI: ibm-acpi: make non-generic bay support optional"
ACPI: update MAINTAINERS
ACPI: schedule obsolete features for deletion
ACPI: delete two spurious ACPI messages
ACPI: rename cstate_entry_s to cstate_entry
ACPI: ec: enable printk on cmdline use
ACPI: Altix: ACPI _PRT support
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 2b0c955590f..91f1f236387 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -47,6 +47,7 @@ enum acpi_irq_model_id { | |||
| 47 | ACPI_IRQ_MODEL_PIC = 0, | 47 | ACPI_IRQ_MODEL_PIC = 0, |
| 48 | ACPI_IRQ_MODEL_IOAPIC, | 48 | ACPI_IRQ_MODEL_IOAPIC, |
| 49 | ACPI_IRQ_MODEL_IOSAPIC, | 49 | ACPI_IRQ_MODEL_IOSAPIC, |
| 50 | ACPI_IRQ_MODEL_PLATFORM, | ||
| 50 | ACPI_IRQ_MODEL_COUNT | 51 | ACPI_IRQ_MODEL_COUNT |
| 51 | }; | 52 | }; |
| 52 | 53 | ||