diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 08:53:56 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-05 08:53:56 +0300 |
commit | 50e177c5bfd9abc3828cb57e14e6169170f6764a (patch) | |
tree | 180aafa376fb7a0a89c7d6812f640f8c46758bd5 /drivers/net/ipa/ipa_reg.h | |
parent | 4ec7ac90ff399b7d9af81cc8afd430a22786c61b (diff) | |
parent | 7e18e42e4b280c85b76967a9106a13ca61c16179 (diff) | |
download | linux-50e177c5bfd9abc3828cb57e14e6169170f6764a.tar.xz |
Merge 6.0-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ipa/ipa_reg.h')
-rw-r--r-- | drivers/net/ipa/ipa_reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h index a5b355384d4a..6f35438cda89 100644 --- a/drivers/net/ipa/ipa_reg.h +++ b/drivers/net/ipa/ipa_reg.h @@ -48,7 +48,7 @@ struct ipa; * * The offset of registers related to resource types is computed by a macro * that is supplied a parameter "rt". The "rt" represents a resource type, - * which is is a member of the ipa_resource_type_src enumerated type for + * which is a member of the ipa_resource_type_src enumerated type for * source endpoint resources or the ipa_resource_type_dst enumerated type * for destination endpoint resources. * |