diff options
| author | Len Brown <len.brown@intel.com> | 2004-09-27 04:05:54 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-09-27 04:05:54 -0400 |
| commit | 6605e0d867f1c44b943c2e06c1aba7268bb2c1bc (patch) | |
| tree | f5fff8c60e295ead16e815b8e7fa97c81f227bca /include/linux | |
| parent | 0eaf89f20ccde6456c1e8d5d08e8036c9a746381 (diff) | |
| parent | db561136bc09338cecbcf3d3bf3c7900860bafc9 (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*/ |