diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 12:51:51 -0400 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/arch-v32/mach-fs/dma.c | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'arch/cris/arch-v32/mach-fs/dma.c')
| -rw-r--r-- | arch/cris/arch-v32/mach-fs/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/mach-fs/dma.c b/arch/cris/arch-v32/mach-fs/dma.c index a6acf4e6345c..2d970d7505c9 100644 --- a/arch/cris/arch-v32/mach-fs/dma.c +++ b/arch/cris/arch-v32/mach-fs/dma.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | #include <hwregs/strmux_defs.h> | 10 | #include <hwregs/strmux_defs.h> |
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #include <asm/system.h> | 12 | #include <asm/system.h> |
| 13 | #include <asm/arch/mach/arbiter.h> | 13 | #include <mach/arbiter.h> |
| 14 | 14 | ||
| 15 | static char used_dma_channels[MAX_DMA_CHANNELS]; | 15 | static char used_dma_channels[MAX_DMA_CHANNELS]; |
| 16 | static const char *used_dma_channels_users[MAX_DMA_CHANNELS]; | 16 | static const char *used_dma_channels_users[MAX_DMA_CHANNELS]; |