diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2015-07-08 16:54:13 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2015-07-13 09:34:40 +1000 |
| commit | 03aa29f80e371c75370e83eded7b551951385122 (patch) | |
| tree | 3c631bbcb991a83560d533abde6eb4dba115fcb8 | |
| parent | 8700f09495dec922600836400d5e26a22f50bf19 (diff) | |
| download | linux-03aa29f80e371c75370e83eded7b551951385122.tar.gz linux-03aa29f80e371c75370e83eded7b551951385122.tar.bz2 linux-03aa29f80e371c75370e83eded7b551951385122.zip | |
m68k: fix io functions for ColdFire/MMU/PCI case
The inb/outb/... family of IO methods end up being multiply defined when
building PCI support for the ColdFire. Compiling gives this:
CC init/main.o
In file included from ./arch/m68k/include/asm/io.h:4:0,
from include/linux/bio.h:30,
from include/linux/blkdev.h:18,
from init/main.c:75:
./arch/m68k/include/asm/io_mm.h:420:0: warning: "inb" redefined
./arch/m68k/include/asm/io_mm.h:108:0: note: this is the location of the previous definition
...
The ColdFire/PCI case defines its own IO access methods, so no others
should be defined or used in this case. Conditionally disable other
definitions that clash with it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
| -rw-r--r-- | arch/m68k/include/asm/io_mm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h index 618c85d3c786..f55cad529400 100644 --- a/arch/m68k/include/asm/io_mm.h +++ b/arch/m68k/include/asm/io_mm.h @@ -413,7 +413,8 @@ static inline void isa_delay(void) #define writew(val, addr) out_le16((addr), (val)) #endif /* CONFIG_ATARI_ROM_ISA */ -#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA) +#if !defined(CONFIG_ISA) && !defined(CONFIG_ATARI_ROM_ISA) && \ + !(defined(CONFIG_PCI) && defined(CONFIG_COLDFIRE)) /* * We need to define dummy functions for GENERIC_IOMAP support. */ |