diff options
| author | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-26 14:51:00 -0400 |
| commit | 7e31842441776b4d6ec7fd916c91663ad05b7814 (patch) | |
| tree | 8d97d41b4f6861dcbc0dc3ac96fab7afddbed731 /include | |
| parent | 1bd64d42abdd4f9d44f77011a31f0292112f4c3b (diff) | |
| parent | b1d248d96c71665c79befb81207f38f894c7c082 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 2 | ||||
| -rw-r--r-- | include/acpi/acpiosxf.h | 2 | ||||
| -rw-r--r-- | include/linux/acpi.h | 8 |
3 files changed, 0 insertions, 12 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 23d78b4d088b..3090471b2a5e 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -115,8 +115,6 @@ void pci_acpi_crs_quirks(void); #define ACPI_PROCESSOR_LIMIT_INCREMENT 0x01 #define ACPI_PROCESSOR_LIMIT_DECREMENT 0x02 -int acpi_processor_set_thermal_limit(acpi_handle handle, int type); - /*-------------------------------------------------------------------------- Dock Station -------------------------------------------------------------------------- */ diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h index 43027432a055..65b3f5888f42 100644 --- a/include/acpi/acpiosxf.h +++ b/include/acpi/acpiosxf.h @@ -98,8 +98,6 @@ acpi_os_table_override(struct acpi_table_header *existing_table, /* * Spinlock primitives */ -acpi_status acpi_os_create_lock(acpi_spinlock * out_handle); - void acpi_os_delete_lock(acpi_spinlock handle); acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock handle); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7774e6d8fddd..050a7bccb836 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -245,8 +245,6 @@ int acpi_check_resource_conflict(const struct resource *res); int acpi_check_region(resource_size_t start, resource_size_t n, const char *name); -int acpi_check_mem_region(resource_size_t start, resource_size_t n, - const char *name); int acpi_resources_are_enforced(void); @@ -347,12 +345,6 @@ static inline int acpi_check_region(resource_size_t start, resource_size_t n, return 0; } -static inline int acpi_check_mem_region(resource_size_t start, - resource_size_t n, const char *name) -{ - return 0; -} - struct acpi_table_header; static inline int acpi_table_parse(char *id, int (*handler)(struct acpi_table_header *)) |