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

arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead

Preparation for uniform definition of ioremap, ioremap_wc, ioremap_wt,
and ioremap_cache, tree-wide.

Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

Dan Williams 2584cf83 124fe20d

+14 -13
+1 -1
arch/arm/mach-shmobile/pm-rcar.c
··· 12 12 #include <linux/err.h> 13 13 #include <linux/mm.h> 14 14 #include <linux/spinlock.h> 15 - #include <asm/io.h> 15 + #include <linux/io.h> 16 16 #include "pm-rcar.h" 17 17 18 18 /* SYSC */
+1 -1
arch/ia64/kernel/cyclone.c
··· 4 4 #include <linux/errno.h> 5 5 #include <linux/timex.h> 6 6 #include <linux/clocksource.h> 7 - #include <asm/io.h> 7 + #include <linux/io.h> 8 8 9 9 /* IBM Summit (EXA) Cyclone counter code*/ 10 10 #define CYCLONE_CBAR_ADDR 0xFEB00CD0
+1 -1
drivers/isdn/icn/icn.h
··· 38 38 #include <linux/errno.h> 39 39 #include <linux/fs.h> 40 40 #include <linux/major.h> 41 - #include <asm/io.h> 41 + #include <linux/io.h> 42 42 #include <linux/kernel.h> 43 43 #include <linux/signal.h> 44 44 #include <linux/slab.h>
+1 -1
drivers/mtd/devices/slram.c
··· 41 41 #include <linux/fs.h> 42 42 #include <linux/ioctl.h> 43 43 #include <linux/init.h> 44 - #include <asm/io.h> 44 + #include <linux/io.h> 45 45 46 46 #include <linux/mtd/mtd.h> 47 47
+1 -1
drivers/mtd/nand/diskonchip.c
··· 24 24 #include <linux/rslib.h> 25 25 #include <linux/moduleparam.h> 26 26 #include <linux/slab.h> 27 - #include <asm/io.h> 27 + #include <linux/io.h> 28 28 29 29 #include <linux/mtd/mtd.h> 30 30 #include <linux/mtd/nand.h>
+1 -1
drivers/mtd/onenand/generic.c
··· 18 18 #include <linux/mtd/mtd.h> 19 19 #include <linux/mtd/onenand.h> 20 20 #include <linux/mtd/partitions.h> 21 - #include <asm/io.h> 21 + #include <linux/io.h> 22 22 23 23 /* 24 24 * Note: Driver name and platform data format have been updated!
+1 -1
drivers/scsi/sun3x_esp.c
··· 12 12 #include <linux/platform_device.h> 13 13 #include <linux/dma-mapping.h> 14 14 #include <linux/interrupt.h> 15 + #include <linux/io.h> 15 16 16 17 #include <asm/sun3x.h> 17 - #include <asm/io.h> 18 18 #include <asm/dma.h> 19 19 #include <asm/dvma.h> 20 20
+1
drivers/staging/comedi/drivers/ii_pci20kc.c
··· 28 28 */ 29 29 30 30 #include <linux/module.h> 31 + #include <linux/io.h> 31 32 #include "../comedidev.h" 32 33 33 34 /*
+1 -1
drivers/tty/serial/8250/8250_core.c
··· 38 38 #include <linux/slab.h> 39 39 #include <linux/uaccess.h> 40 40 #include <linux/pm_runtime.h> 41 + #include <linux/io.h> 41 42 #ifdef CONFIG_SPARC 42 43 #include <linux/sunserialcore.h> 43 44 #endif 44 45 45 - #include <asm/io.h> 46 46 #include <asm/irq.h> 47 47 48 48 #include "8250.h"
+1 -2
drivers/video/fbdev/s1d13xxxfb.c
··· 32 32 #include <linux/spinlock_types.h> 33 33 #include <linux/spinlock.h> 34 34 #include <linux/slab.h> 35 - 36 - #include <asm/io.h> 35 + #include <linux/io.h> 37 36 38 37 #include <video/s1d13xxxfb.h> 39 38
+1
drivers/video/fbdev/stifb.c
··· 64 64 #include <linux/fb.h> 65 65 #include <linux/init.h> 66 66 #include <linux/ioport.h> 67 + #include <linux/io.h> 67 68 68 69 #include <asm/grfioctl.h> /* for HP-UX compatibility */ 69 70 #include <asm/uaccess.h>
+1 -1
include/linux/io-mapping.h
··· 21 21 #include <linux/types.h> 22 22 #include <linux/slab.h> 23 23 #include <linux/bug.h> 24 - #include <asm/io.h> 24 + #include <linux/io.h> 25 25 #include <asm/page.h> 26 26 27 27 /*
+1 -1
include/linux/mtd/map.h
··· 27 27 #include <linux/string.h> 28 28 #include <linux/bug.h> 29 29 #include <linux/kernel.h> 30 + #include <linux/io.h> 30 31 31 32 #include <asm/unaligned.h> 32 - #include <asm/io.h> 33 33 #include <asm/barrier.h> 34 34 35 35 #ifdef CONFIG_MTD_MAP_BANK_WIDTH_1
+1 -1
include/video/vga.h
··· 18 18 #define __linux_video_vga_h__ 19 19 20 20 #include <linux/types.h> 21 - #include <asm/io.h> 21 + #include <linux/io.h> 22 22 #include <asm/vga.h> 23 23 #include <asm/byteorder.h> 24 24