Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+8
+8
arch/m68k/include/asm/vga.h
··· 2 2 #ifndef _ASM_M68K_VGA_H 3 3 #define _ASM_M68K_VGA_H 4 4 5 + /* 6 + * Some ColdFire platforms do in fact have a PCI bus. So for those we want 7 + * to use the real IO access functions, don't fake them out or redirect them 8 + * for that case. 9 + */ 10 + #ifndef CONFIG_PCI 11 + 5 12 #include <asm/raw_io.h> 6 13 #include <asm/kmap.h> 7 14 ··· 33 26 #define writeb raw_outb 34 27 #define writew raw_outw 35 28 29 + #endif /* CONFIG_PCI */ 36 30 #endif /* _ASM_M68K_VGA_H */