Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git

[linux-2.6] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 88b5dfd8ee125be2c3a025c7ea1e03183eaccbe4..91f1f23638700b92ec687279ea2ced21cee974c5 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -47,6 +47,7 @@ enum acpi_irq_model_id {
        ACPI_IRQ_MODEL_PIC = 0,
        ACPI_IRQ_MODEL_IOAPIC,
        ACPI_IRQ_MODEL_IOSAPIC,
+       ACPI_IRQ_MODEL_PLATFORM,
        ACPI_IRQ_MODEL_COUNT
 };
 
@@ -494,6 +495,9 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver);
 
 extern int ec_read(u8 addr, u8 *val);
 extern int ec_write(u8 addr, u8 val);
+extern int ec_transaction(u8 command,
+                          const u8 *wdata, unsigned wdata_len,
+                          u8 *rdata, unsigned rdata_len);
 
 #endif /*CONFIG_ACPI_EC*/