Merge branches 'acpi-power', 'acpi-blacklist', 'acpi-video' and 'acpi-doc'

[sfrench/cifs-2.6.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 9b05886f9773cde8439a0c3e21b39ad29460c440..07f8924a2dfdec048f3e5e3e0a9b954b8f6ed986 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -233,10 +233,6 @@ int acpi_numa_init (void);
 
 int acpi_table_init (void);
 int acpi_table_parse(char *id, acpi_tbl_table_handler handler);
-int __init acpi_parse_entries(char *id, unsigned long table_size,
-                             acpi_tbl_entry_handler handler,
-                             struct acpi_table_header *table_header,
-                             int entry_id, unsigned int max_entries);
 int __init acpi_table_parse_entries(char *id, unsigned long table_size,
                              int entry_id,
                              acpi_tbl_entry_handler handler,
@@ -611,6 +607,11 @@ static inline bool acpi_dev_found(const char *hid)
        return false;
 }
 
+static inline bool acpi_dev_present(const char *hid, const char *uid, s64 hrv)
+{
+       return false;
+}
+
 static inline bool is_acpi_node(struct fwnode_handle *fwnode)
 {
        return false;