From: Bart Van Assche <bvanassche@acm.org>
To: Russell King <linux@armlinux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org,
Bart Van Assche <bvanassche@acm.org>,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH] ARM: riscpc: Unbreak the build
Date: Tue, 30 Aug 2022 12:55:17 -0700 [thread overview]
Message-ID: <20220830195520.1668785-1-bvanassche@acm.org> (raw)
This patch fixes the following build error:
In file included from ./include/linux/io.h:13,
from ./arch/arm/mach-rpc/include/mach/uncompress.h:9,
from arch/arm/boot/compressed/misc.c:31:
./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’
85 | #define __raw_writeb __raw_writeb
| ^~~~~~~~~~~~
./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’
86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
| ^~~~~~~~~~~~
In file included from arch/arm/boot/compressed/misc.c:26:
arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here
13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr)
| ^~~~~~~~~~~~
To: Russell King <linux@armlinux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
arch/arm/mach-rpc/include/mach/uncompress.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h
index 1fbe7eb956fd..97edaf6a1f07 100644
--- a/arch/arm/mach-rpc/include/mach/uncompress.h
+++ b/arch/arm/mach-rpc/include/mach/uncompress.h
@@ -6,7 +6,6 @@
*/
#define VIDMEM ((char *)SCREEN_START)
-#include <linux/io.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/page.h>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-08-30 19:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 19:55 Bart Van Assche [this message]
2022-08-30 19:58 ` [PATCH] ARM: riscpc: Unbreak the build Russell King (Oracle)
2022-08-30 20:55 ` Bart Van Assche
2022-08-30 21:27 ` Russell King (Oracle)
2022-08-31 7:33 ` Arnd Bergmann
2022-08-31 20:56 ` Arnd Bergmann
2022-09-08 20:34 Bart Van Assche
2022-09-08 20:38 ` Russell King (Oracle)
2022-09-08 20:45 ` Bart Van Assche
2022-09-09 6:25 ` Arnd Bergmann
2022-09-12 21:59 Bart Van Assche
2022-09-12 22:13 Bart Van Assche
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220830195520.1668785-1-bvanassche@acm.org \
--to=bvanassche@acm.org \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux@armlinux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).