diff options
| author | Len Brown <len.brown@intel.com> | 2004-10-06 16:39:04 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2004-10-06 16:39:04 -0400 |
| commit | f2493ff8e27a501063d270a2c6089295c77c73fc (patch) | |
| tree | 06fb95a2c7cea10a61f7c2d592919beb3ffe9615 /include/linux | |
| parent | 8fc0532aeaf9cfb8051240b79f40f7cf448b7d4b (diff) | |
| parent | e51b486367bb89fc81abffd6656208a9d73d21fa (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*/ |