Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df8f77de authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@linux-m68k.org>
Reviewed-by: default avatarAngelo Dureghello <angelo@sysam.it>
Tested-by: default avatarAngelo Dureghello <angelo@sysam.it>
parent de25cfcb

arch/m68k/include/asm/vga.h

+8 −0
Original line number Diff line number Diff line
@@ -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 */