summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove/include/mach/uncompress.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-11 07:39:38 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-10-11 07:39:38 +0200
commit620b74d01b9d4393bef6742bf121908322c2fe0b (patch)
tree507ab81bf701a1500b617526afa4232a0634a206 /arch/arm/mach-dove/include/mach/uncompress.h
parentc326d3ed52c8b47f0de329b3b213dc32409d3656 (diff)
parent64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc (diff)
downloadlinux-620b74d01b9d4393bef6742bf121908322c2fe0b.tar.bz2
Merge 5.15-rc5 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-dove/include/mach/uncompress.h')
-rw-r--r--arch/arm/mach-dove/include/mach/uncompress.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-dove/include/mach/uncompress.h b/arch/arm/mach-dove/include/mach/uncompress.h
index 7a4bd8838036..ddf873f35e2b 100644
--- a/arch/arm/mach-dove/include/mach/uncompress.h
+++ b/arch/arm/mach-dove/include/mach/uncompress.h
@@ -11,7 +11,7 @@
#define LSR_THRE 0x20
-static void putc(const char c)
+static inline void putc(const char c)
{
int i;
@@ -24,7 +24,7 @@ static void putc(const char c)
*UART_THR = c;
}
-static void flush(void)
+static inline void flush(void)
{
}