diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/cris/arch-v32/kernel/crisksyms.c | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/cris/arch-v32/kernel/crisksyms.c')
| -rw-r--r-- | arch/cris/arch-v32/kernel/crisksyms.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/crisksyms.c b/arch/cris/arch-v32/kernel/crisksyms.c index 77d02c15a7fc..64933e2c0f5b 100644 --- a/arch/cris/arch-v32/kernel/crisksyms.c +++ b/arch/cris/arch-v32/kernel/crisksyms.c | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/irq.h> | 2 | #include <linux/irq.h> |
| 3 | #include <asm/arch/dma.h> | 3 | #include <arch/dma.h> |
| 4 | #include <asm/arch/intmem.h> | 4 | #include <arch/intmem.h> |
| 5 | #include <asm/arch/mach/pinmux.h> | 5 | #include <mach/pinmux.h> |
| 6 | #include <asm/arch/io.h> | 6 | #include <arch/io.h> |
| 7 | 7 | ||
| 8 | /* Functions for allocating DMA channels */ | 8 | /* Functions for allocating DMA channels */ |
| 9 | EXPORT_SYMBOL(crisv32_request_dma); | 9 | EXPORT_SYMBOL(crisv32_request_dma); |