diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 15:00:19 -0400 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 15:00:19 -0400 |
| commit | cc1c8445eba5b78f5b719c47572473d7a7caa038 (patch) | |
| tree | 3954bcaa641ee362bf06b7aa9197d30a90eb4ca3 /drivers/rpmsg | |
| parent | ab460a2e72dabecfdabd45eb7e3ee2d73fc876d4 (diff) | |
| parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
Merge tag 'v4.17-rc4' into rpmsg-next
Pick up fixes from rproc-v4.17-1
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/rpmsg')
| -rw-r--r-- | drivers/rpmsg/rpmsg_char.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c index 64b6de9763ee..1efdf9ff8679 100644 --- a/drivers/rpmsg/rpmsg_char.c +++ b/drivers/rpmsg/rpmsg_char.c | |||
| @@ -581,4 +581,6 @@ static void rpmsg_chrdev_exit(void) | |||
| 581 | unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); | 581 | unregister_chrdev_region(rpmsg_major, RPMSG_DEV_MAX); |
| 582 | } | 582 | } |
| 583 | module_exit(rpmsg_chrdev_exit); | 583 | module_exit(rpmsg_chrdev_exit); |
| 584 | |||
| 585 | MODULE_ALIAS("rpmsg:rpmsg_chrdev"); | ||
| 584 | MODULE_LICENSE("GPL v2"); | 586 | MODULE_LICENSE("GPL v2"); |