diff options
author | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-03-22 05:02:08 -0500 |
commit | 5501972e0b5857bc8354770d900ceb9b40c7f6b7 (patch) | |
tree | ff239422827c4cd54d2998f8851304255de31b38 /arch/mips/au1000/common/dma.c | |
parent | 9d2f928ddf64ca0361562e30faf584cd33055c60 (diff) | |
parent | e952f31bce6e9f64db01f607abc46529ba57ac9e (diff) |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/mips/au1000/common/dma.c')
-rw-r--r-- | arch/mips/au1000/common/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/common/dma.c b/arch/mips/au1000/common/dma.c index 1905c6b104f2..1d82f2277517 100644 --- a/arch/mips/au1000/common/dma.c +++ b/arch/mips/au1000/common/dma.c | |||
@@ -174,7 +174,7 @@ int request_au1000_dma(int dev_id, const char *dev_str, | |||
174 | return -EINVAL; | 174 | return -EINVAL; |
175 | #else | 175 | #else |
176 | if (dev_id < 0 || dev_id >= DMA_NUM_DEV) | 176 | if (dev_id < 0 || dev_id >= DMA_NUM_DEV) |
177 | return -EINVAL; | 177 | return -EINVAL; |
178 | #endif | 178 | #endif |
179 | 179 | ||
180 | for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) { | 180 | for (i = 0; i < NUM_AU1000_DMA_CHANNELS; i++) { |