diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 23:26:44 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 23:26:44 +0300 |
| commit | a976c2951d8f376112361830aa7762beff83a205 (patch) | |
| tree | 24f6647aedd4b570cb67f3195962f5c8a040c824 /include/linux/rpmsg | |
| parent | 83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff) | |
| parent | 16b9951f656ea8f2b47546bd898325a7e256932f (diff) | |
| download | linux-a976c2951d8f376112361830aa7762beff83a205.tar.xz | |
Merge back ACPICA material for v4.13.
Diffstat (limited to 'include/linux/rpmsg')
| -rw-r--r-- | include/linux/rpmsg/qcom_smd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rpmsg/qcom_smd.h b/include/linux/rpmsg/qcom_smd.h index 8ec8b6439b25..f27917e0a101 100644 --- a/include/linux/rpmsg/qcom_smd.h +++ b/include/linux/rpmsg/qcom_smd.h @@ -6,7 +6,7 @@ struct qcom_smd_edge; -#if IS_ENABLED(CONFIG_RPMSG_QCOM_SMD) || IS_ENABLED(CONFIG_QCOM_SMD) +#if IS_ENABLED(CONFIG_RPMSG_QCOM_SMD) struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent, struct device_node *node); |