diff options
author | Tony Lindgren <tony@atomide.com> | 2007-02-12 10:50:53 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2007-03-02 01:47:13 -0800 |
commit | 04fbf6a29182eb4285bb8bb826fc34fe84a62d9c (patch) | |
tree | 9ed6e88d590a4dbb81d086e84cdae688bc52d3b4 | |
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>
-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 924dea54e16..1e7ed6d22ca 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -39,7 +39,6 @@ #include "prcm-regs.h" #include <asm/io.h> -#include <asm/delay.h> static unsigned int row_gpios[6] = { 88, 89, 124, 11, 6, 96 }; 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 ec50008a2df..b8d6f17ff58 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -20,8 +20,8 @@ #include <linux/interrupt.h> #include <linux/err.h> #include <linux/clk.h> +#include <linux/delay.h> -#include <asm/delay.h> #include <asm/io.h> #include <asm/irq.h> |