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
This commit is contained in:
Rafael J. Wysocki 2015-06-19 01:17:35 +02:00
commit e193cd15ae
15 changed files with 228 additions and 89 deletions

View file

@ -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 */