Skip to content

Commit 32844a8

Browse files
bvanasscheRussell King (Oracle)
authored andcommitted
ARM: 9243/1: riscpc: Unbreak the build
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 <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: [email protected] Fixes: 0361c7e ("ARM: ep93xx: multiplatform support") Signed-off-by: Bart Van Assche <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent 25af740 commit 32844a8

File tree

1 file changed

+2
-0
lines changed
  • arch/arm/boot/compressed

1 file changed

+2
-0
lines changed

arch/arm/boot/compressed/misc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ unsigned int __machine_arch_type;
2323
#include <linux/types.h>
2424
#include <linux/linkage.h>
2525
#include "misc.h"
26+
#ifdef CONFIG_ARCH_EP93XX
2627
#include "misc-ep93xx.h"
28+
#endif
2729

2830
static void putstr(const char *ptr);
2931

0 commit comments

Comments
 (0)