diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-09-06 07:10:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-09-06 07:10:45 -0400 |
| commit | fced80c735941fa518ac67c0b61bbe153fb8c050 (patch) | |
| tree | 16f3abeb03e8c164108873bc5aab660a506577c5 /arch/arm/mach-msm/board-halibut.c | |
| parent | 33fa9b13285e76fb95d940120964562e4c7081c2 (diff) | |
[ARM] Convert asm/io.h to linux/io.h
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-msm/board-halibut.c')
| -rw-r--r-- | arch/arm/mach-msm/board-halibut.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c index 995afc4ade4b..a24259133e07 100644 --- a/arch/arm/mach-msm/board-halibut.c +++ b/arch/arm/mach-msm/board-halibut.c | |||
| @@ -18,6 +18,8 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/io.h> | ||
| 22 | #include <linux/delay.h> | ||
| 21 | 23 | ||
| 22 | #include <mach/hardware.h> | 24 | #include <mach/hardware.h> |
| 23 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
| @@ -28,9 +30,6 @@ | |||
| 28 | #include <mach/board.h> | 30 | #include <mach/board.h> |
| 29 | #include <mach/msm_iomap.h> | 31 | #include <mach/msm_iomap.h> |
| 30 | 32 | ||
| 31 | #include <asm/io.h> | ||
| 32 | #include <asm/delay.h> | ||
| 33 | |||
| 34 | #include <linux/mtd/nand.h> | 33 | #include <linux/mtd/nand.h> |
| 35 | #include <linux/mtd/partitions.h> | 34 | #include <linux/mtd/partitions.h> |
| 36 | 35 | ||