Răsfoiți Sursa

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>
Greg Ungerer 7 ani în urmă
părinte
comite
df8f77dec7
1 a modificat fișierele cu 8 adăugiri și 0 ștergeri
  1. 8 0
      arch/m68k/include/asm/vga.h

+ 8 - 0
arch/m68k/include/asm/vga.h

@@ -2,6 +2,13 @@
 #ifndef _ASM_M68K_VGA_H
 #ifndef _ASM_M68K_VGA_H
 #define _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/raw_io.h>
 #include <asm/kmap.h>
 #include <asm/kmap.h>
 
 
@@ -26,4 +33,5 @@
 #define writeb			raw_outb
 #define writeb			raw_outb
 #define writew			raw_outw
 #define writew			raw_outw
 
 
+#endif /* CONFIG_PCI */
 #endif /* _ASM_M68K_VGA_H */
 #endif /* _ASM_M68K_VGA_H */