diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 06:59:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 07:04:16 -0500 |
| commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
| tree | 588b44b4b8929caf812d440ec371331658fd7da3 /arch/arm/plat-omap/mcbsp.c | |
| parent | 9623b3732d11b0a18d9af3419f680d27ea24b014 (diff) | |
| parent | 1f4d1774133f596a3c4f520859890ad93769e523 (diff) | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/mcbsp.c')
| -rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||