OSDN Git Service

m68k: fix io functions for ColdFire/MMU/PCI case
authorGreg Ungerer <gerg@uclinux.org>
Wed, 8 Jul 2015 06:54:13 +0000 (16:54 +1000)
committerGreg Ungerer <gerg@uclinux.org>
Sun, 12 Jul 2015 23:34:40 +0000 (09:34 +1000)
commit03aa29f80e371c75370e83eded7b551951385122
tree3c631bbcb991a83560d533abde6eb4dba115fcb8
parent8700f09495dec922600836400d5e26a22f50bf19
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>
arch/m68k/include/asm/io_mm.h