sh: don't include <asm/io_trapped.h> in <asm/io.h>

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

kernel os linux

No need to expose the details of trapped I/O to drivers.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Felker <dalias@libc.org>

authored by

Christoph Hellwig and committed by

Rich Felker 5 years ago 08732d12 13f1fc87

+2 -1

3 changed files

expand all

arch

include

asm

io.h

kernel

ioport.c

ioremap.c

-1

arch/sh/include/asm/io.h

··· 22 22 23 23 #define __IO_PREFIX generic 24 24 #include <asm/io_generic.h> 25 - #include <asm/io_trapped.h> 26 25 #include <asm-generic/pci_iomap.h> 27 26 #include <mach/mangle-port.h> 28 27

arch/sh/kernel/ioport.c

··· 7 7 */ 8 8 #include <linux/module.h> 9 9 #include <linux/io.h> 10 + #include <asm/io_trapped.h> 10 11 11 12 unsigned long sh_io_port_base __read_mostly = -1; 12 13 EXPORT_SYMBOL(sh_io_port_base);

arch/sh/mm/ioremap.c

··· 18 18 #include <linux/mm.h> 19 19 #include <linux/pci.h> 20 20 #include <linux/io.h> 21 + #include <asm/io_trapped.h> 21 22 #include <asm/page.h> 22 23 #include <asm/pgalloc.h> 23 24 #include <asm/addrspace.h>