diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-12 05:14:11 +0300 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-12 05:14:11 +0300 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /include/linux | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
| download | linux-3e0fe364835cecc8560cf32bb9609f4c56c5d9fa.tar.xz | |
Merge branch 'misc' into release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/acpi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index fd6a452b0ceb..d7846bdd2721 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -163,8 +163,6 @@ struct acpi_pci_driver { int acpi_pci_register_driver(struct acpi_pci_driver *driver); void acpi_pci_unregister_driver(struct acpi_pci_driver *driver); -#ifdef CONFIG_ACPI_EC - extern int ec_read(u8 addr, u8 *val); extern int ec_write(u8 addr, u8 val); extern int ec_transaction(u8 command, @@ -172,8 +170,6 @@ extern int ec_transaction(u8 command, u8 *rdata, unsigned rdata_len, int force_poll); -#endif /*CONFIG_ACPI_EC*/ - #if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE) typedef void (*wmi_notify_handler) (u32 value, void *context); |