diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-06-22 21:20:35 +0200 | 
| commit | 7731b8bc94e599c9a79e428f3359ff2c34b7576a (patch) | |
| tree | 879f18ccbe274122f2d4f095b43cbc7f953e0ada /drivers/mailbox/qcom-apcs-ipc-mailbox.c | |
| parent | 48e315618dc4dc8904182cd221e3d395d5d97005 (diff) | |
| parent | 9ffc59d57228d74809700be6f7ecb1db10292f05 (diff) | |
Merge branch 'linus' into x86/urgent
Required to queue a dependent fix.
Diffstat (limited to 'drivers/mailbox/qcom-apcs-ipc-mailbox.c')
| -rw-r--r-- | drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 57bde0dfd12f..333ed4a9d4b8 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -125,6 +125,8 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev)  static const struct of_device_id qcom_apcs_ipc_of_match[] = {  	{ .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 },  	{ .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 }, +	{ .compatible = "qcom,msm8998-apcs-hmss-global", .data = (void *)8 }, +	{ .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 },  	{}  };  MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match);  | 
