diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 19:38:38 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-22 19:38:38 +0300 |
commit | 42a62da0ae660e71c280bd8b287b994c1af1352c (patch) | |
tree | f0c091088e98037f9cf86c62c64b335ab1aeb3fa /drivers/net/wireless/ralink/rt2x00/rt2500pci.h | |
parent | a3be423f0657e603b45998ef2bb9e5d27dc226c3 (diff) | |
parent | eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 (diff) | |
download | linux-42a62da0ae660e71c280bd8b287b994c1af1352c.tar.xz |
Merge 6.1-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/ralink/rt2x00/rt2500pci.h')
-rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt2500pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500pci.h b/drivers/net/wireless/ralink/rt2x00/rt2500pci.h index 7e64aee2a172..ba362675c52c 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.h +++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.h @@ -1219,6 +1219,6 @@ (((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower) #define TXPOWER_TO_DEV(__txpower) \ - clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER) + clamp_t(u8, __txpower, MIN_TXPOWER, MAX_TXPOWER) #endif /* RT2500PCI_H */ |