Merge branches 'acpi-ec', 'acpi-dma', 'acpi-processor' and 'acpi-cppc'

[linux-2.6-block.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 27b4b66152637fe38b82711f0fa66d6ce946f7d7..1c3478c6b8972e7c384610f556cb0e82685c7bc6 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -427,6 +427,8 @@ void acpi_dev_free_resource_list(struct list_head *list);
 int acpi_dev_get_resources(struct acpi_device *adev, struct list_head *list,
                           int (*preproc)(struct acpi_resource *, void *),
                           void *preproc_data);
+int acpi_dev_get_dma_resources(struct acpi_device *adev,
+                              struct list_head *list);
 int acpi_dev_filter_resource_type(struct acpi_resource *ares,
                                  unsigned long types);
 
@@ -774,6 +776,12 @@ static inline enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev)
        return DEV_DMA_NOT_SUPPORTED;
 }
 
+static inline int acpi_dma_get_range(struct device *dev, u64 *dma_addr,
+                                    u64 *offset, u64 *size)
+{
+       return -ENODEV;
+}
+
 static inline int acpi_dma_configure(struct device *dev,
                                     enum dev_dma_attr attr)
 {