diff options
| author | Len Brown <len.brown@intel.com> | 2004-06-16 17:42:44 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-06-16 17:42:44 -0400 |
| commit | 3a40a2c1008a69565b817e6fecd1293f622f335e (patch) | |
| tree | cc4a935aeffb4d21083535f3c76acf754bfe3462 /include/linux | |
| parent | 331cc23ed7b4df06becdbfce88d4706f887a4d4f (diff) | |
| parent | c76f45470b599a1da6ee15c1b7d9ff35234375f0 (diff) | |
Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.7
into intel.com:/home/lenb/bk/linux-acpi-test-2.6.7
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d56069ba4f5b..f82aa67ea6b8 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -413,6 +413,8 @@ static inline int acpi_boot_init(void) #endif /*!CONFIG_ACPI_BOOT*/ +unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_low); +int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); #ifdef CONFIG_ACPI_PCI @@ -437,8 +439,6 @@ extern struct acpi_prt_list acpi_prt; struct pci_dev; int acpi_pci_irq_enable (struct pci_dev *dev); -int acpi_pci_irq_init (void); -int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); struct acpi_pci_driver { struct acpi_pci_driver *next; |