From: Greg Ungerer <gerg@linux-m68k.org>
Date: Mon, 26 Mar 2018 02:35:18 +0000 (+1000)
Subject: m68k: don't redefine access functions if we have PCI
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=df8f77dec74319794eff9a93d68ada7998b0d510;p=linux.git

m68k: don't redefine access functions if we have PCI

Some ColdFire platforms do have real PCI buses, so we should not be
re-defining or otherwise mangling the IO access functions for them.
So when CONFIG_PCI is true use the real io.h support.

Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Reviewed-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
---

diff --git a/arch/m68k/include/asm/vga.h b/arch/m68k/include/asm/vga.h
index 819d46d918864..4742e6bc3ab8e 100644
--- a/arch/m68k/include/asm/vga.h
+++ b/arch/m68k/include/asm/vga.h
@@ -2,6 +2,13 @@
 #ifndef _ASM_M68K_VGA_H
 #define _ASM_M68K_VGA_H
 
+/*
+ * Some ColdFire platforms do in fact have a PCI bus. So for those we want
+ * to use the real IO access functions, don't fake them out or redirect them
+ * for that case.
+ */
+#ifndef CONFIG_PCI
+
 #include <asm/raw_io.h>
 #include <asm/kmap.h>
 
@@ -26,4 +33,5 @@
 #define writeb			raw_outb
 #define writew			raw_outw
 
+#endif /* CONFIG_PCI */
 #endif /* _ASM_M68K_VGA_H */