diff options
| author | Len Brown <len.brown@intel.com> | 2004-10-04 04:11:50 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-10-04 04:11:50 -0400 |
| commit | e51b486367bb89fc81abffd6656208a9d73d21fa (patch) | |
| tree | efc2dfdd8dfa155dd8a0d3a41cb3271df7e5cd3f /include/linux | |
| parent | edd2ffb9554da34b1e26ed5556e5a54180618c7b (diff) | |
| parent | 6605e0d867f1c44b943c2e06c1aba7268bb2c1bc (diff) | |
Merge intel.com:/home/lenb/bk/26-latest-ref
into intel.com:/home/lenb/src/26-latest-dev
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index f82aa67ea6b8..041f660ec009 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -453,14 +453,15 @@ void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); #ifdef CONFIG_ACPI_EC -int ec_read(u8 addr, u8 *val); -int ec_write(u8 addr, u8 val); +extern int ec_read(u8 addr, u8 *val); +extern int ec_write(u8 addr, u8 val); #endif /*CONFIG_ACPI_EC*/ #ifdef CONFIG_ACPI_INTERPRETER -int acpi_blacklisted(void); +extern int acpi_blacklisted(void); +extern void acpi_bios_year(char *s); #else /*!CONFIG_ACPI_INTERPRETER*/ |