diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 10:00:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-03 10:00:53 -0700 |
| commit | 0d2c5a9e15179806fd9ff24409d2c0d689fc422f (patch) | |
| tree | ad9fd3f7a70da76cb5a45af128ba48ed15b7ca53 /include | |
| parent | Merge tag 'usb-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
| parent | soc: qcom-geni-se: Cleanup the code to remove proxy votes (diff) | |
| download | linux-dev-0d2c5a9e15179806fd9ff24409d2c0d689fc422f.tar.xz linux-dev-0d2c5a9e15179806fd9ff24409d2c0d689fc422f.zip | |
Merge tag 'tty-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull serial driver fix from Greg KH:
"Here is a single serial driver fix for 5.12-rc6. Is is a revert of a
change that showed up in 5.9 that has been reported to cause problems.
It has been in linux-next for a while with no reported issues"
* tag 'tty-5.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
soc: qcom-geni-se: Cleanup the code to remove proxy votes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/qcom-geni-se.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/qcom-geni-se.h b/include/linux/qcom-geni-se.h index ec2ad4b0fe14..c4fdb4463f7d 100644 --- a/include/linux/qcom-geni-se.h +++ b/include/linux/qcom-geni-se.h @@ -460,7 +460,5 @@ void geni_icc_set_tag(struct geni_se *se, u32 tag); int geni_icc_enable(struct geni_se *se); int geni_icc_disable(struct geni_se *se); - -void geni_remove_earlycon_icc_vote(void); #endif #endif |