Skip to content

Commit 2584cf8

Browse files
committed
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 <[email protected]> Signed-off-by: Dan Williams <[email protected]>
1 parent 124fe20 commit 2584cf8

File tree

14 files changed

+14
-13
lines changed

14 files changed

+14
-13
lines changed

arch/arm/mach-shmobile/pm-rcar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <linux/err.h>
1313
#include <linux/mm.h>
1414
#include <linux/spinlock.h>
15-
#include <asm/io.h>
15+
#include <linux/io.h>
1616
#include "pm-rcar.h"
1717

1818
/* SYSC */

arch/ia64/kernel/cyclone.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <linux/errno.h>
55
#include <linux/timex.h>
66
#include <linux/clocksource.h>
7-
#include <asm/io.h>
7+
#include <linux/io.h>
88

99
/* IBM Summit (EXA) Cyclone counter code*/
1010
#define CYCLONE_CBAR_ADDR 0xFEB00CD0

drivers/isdn/icn/icn.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ typedef struct icn_cdef {
3838
#include <linux/errno.h>
3939
#include <linux/fs.h>
4040
#include <linux/major.h>
41-
#include <asm/io.h>
41+
#include <linux/io.h>
4242
#include <linux/kernel.h>
4343
#include <linux/signal.h>
4444
#include <linux/slab.h>

drivers/mtd/devices/slram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include <linux/fs.h>
4242
#include <linux/ioctl.h>
4343
#include <linux/init.h>
44-
#include <asm/io.h>
44+
#include <linux/io.h>
4545

4646
#include <linux/mtd/mtd.h>
4747

drivers/mtd/nand/diskonchip.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <linux/rslib.h>
2525
#include <linux/moduleparam.h>
2626
#include <linux/slab.h>
27-
#include <asm/io.h>
27+
#include <linux/io.h>
2828

2929
#include <linux/mtd/mtd.h>
3030
#include <linux/mtd/nand.h>

drivers/mtd/onenand/generic.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <linux/mtd/mtd.h>
1919
#include <linux/mtd/onenand.h>
2020
#include <linux/mtd/partitions.h>
21-
#include <asm/io.h>
21+
#include <linux/io.h>
2222

2323
/*
2424
* Note: Driver name and platform data format have been updated!

drivers/scsi/sun3x_esp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#include <linux/platform_device.h>
1313
#include <linux/dma-mapping.h>
1414
#include <linux/interrupt.h>
15+
#include <linux/io.h>
1516

1617
#include <asm/sun3x.h>
17-
#include <asm/io.h>
1818
#include <asm/dma.h>
1919
#include <asm/dvma.h>
2020

drivers/staging/comedi/drivers/ii_pci20kc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*/
2929

3030
#include <linux/module.h>
31+
#include <linux/io.h>
3132
#include "../comedidev.h"
3233

3334
/*

drivers/tty/serial/8250/8250_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
#include <linux/slab.h>
3939
#include <linux/uaccess.h>
4040
#include <linux/pm_runtime.h>
41+
#include <linux/io.h>
4142
#ifdef CONFIG_SPARC
4243
#include <linux/sunserialcore.h>
4344
#endif
4445

45-
#include <asm/io.h>
4646
#include <asm/irq.h>
4747

4848
#include "8250.h"

drivers/video/fbdev/s1d13xxxfb.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
#include <linux/spinlock_types.h>
3333
#include <linux/spinlock.h>
3434
#include <linux/slab.h>
35-
36-
#include <asm/io.h>
35+
#include <linux/io.h>
3736

3837
#include <video/s1d13xxxfb.h>
3938

0 commit comments

Comments
 (0)