diff options
| author | Tony Lindgren <tony@atomide.com> | 2007-02-12 13:50:53 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2007-03-02 04:47:13 -0500 |
| commit | 04fbf6a29182eb4285bb8bb826fc34fe84a62d9c (patch) | |
| tree | 9ed6e88d590a4dbb81d086e84cdae688bc52d3b4 /arch/arm | |
| parent | 2f4ff76499b9d0fb877b907a7cd5a28e3356ba28 (diff) | |
ARM: OMAP: Use linux/delay.h not asm/delay.h
Use linux/delay.h not asm/delay.h
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-h4.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 924dea54e16d..1e7ed6d22ca9 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include "prcm-regs.h" | 39 | #include "prcm-regs.h" |
| 40 | 40 | ||
| 41 | #include <asm/io.h> | 41 | #include <asm/io.h> |
| 42 | #include <asm/delay.h> | ||
| 43 | 42 | ||
| 44 | static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 }; | 43 | static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 }; |
| 45 | static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 }; | 44 | static unsigned int col_gpios[7] = { 90, 91, 100, 36, 12, 97, 98 }; |
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index ec50008a2df6..b8d6f17ff58f 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
| @@ -20,8 +20,8 @@ | |||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/delay.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/delay.h> | ||
| 25 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 27 | 27 | ||