summaryrefslogtreecommitdiff
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:17:35 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:17:35 +0200
commite193cd15ae98817ad82cc8bad61a200ac561e98c (patch)
treea4b645de8fe35f75e3d9459461bb89e8ffc41979 /include/linux/acpi.h
parent4def8a360fc6119e09916708cca0977a1495ccf4 (diff)
parente144cd045e123757b6b5f732c420b94dd5544407 (diff)
Merge branch 'acpi-cca'
* acpi-cca: ufs: fix TRUE and FALSE re-define build error megaraid_sas: fix TRUE and FALSE re-define build error amd-xgbe: Unify coherency checking logic with device_dma_is_coherent() crypto: ccp - Unify coherency checking logic with device_dma_is_coherent() device property: Introduces device_dma_is_coherent() arm64 : Introduce support for ACPI _CCA object ACPI / scan: Parse _CCA and setup device coherency
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 81afa65e6457..400b86453ed7 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -553,6 +553,11 @@ static inline int acpi_device_modalias(struct device *dev,
return -ENODEV;
}
+static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
+{
+ return false;
+}
+
#define ACPI_PTR(_ptr) (NULL)
#endif /* !CONFIG_ACPI */