summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@linux-m68k.org>2018-03-26 12:35:18 +1000
committerGreg Ungerer <gerg@linux-m68k.org>2018-05-28 09:45:26 +1000
commitdf8f77dec74319794eff9a93d68ada7998b0d510 (patch)
treec67d6c1b41b3ac411138e8539f3c4dba5448daee /arch/m68k
parentde25cfcb6404a0370067bbadaf13122f15464459 (diff)
downloadlinux-df8f77dec74319794eff9a93d68ada7998b0d510.tar.gz
linux-df8f77dec74319794eff9a93d68ada7998b0d510.tar.bz2
linux-df8f77dec74319794eff9a93d68ada7998b0d510.zip
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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/vga.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/vga.h b/arch/m68k/include/asm/vga.h
index 819d46d91886..4742e6bc3ab8 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 */