diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/blackfin/lib/ins.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/blackfin/lib/ins.S')
| -rw-r--r-- | arch/blackfin/lib/ins.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S index 3edbd8db6598..79caccea85ca 100644 --- a/arch/blackfin/lib/ins.S +++ b/arch/blackfin/lib/ins.S | |||
| @@ -67,7 +67,7 @@ | |||
| 67 | * - DMA version, which do not suffer from this issue. DMA versions have | 67 | * - DMA version, which do not suffer from this issue. DMA versions have |
| 68 | * different name (prefixed by dma_ ), and are located in | 68 | * different name (prefixed by dma_ ), and are located in |
| 69 | * ../kernel/bfin_dma_5xx.c | 69 | * ../kernel/bfin_dma_5xx.c |
| 70 | * Using the dma related functions are recommended for transfering large | 70 | * Using the dma related functions are recommended for transferring large |
| 71 | * buffers in/out of FIFOs. | 71 | * buffers in/out of FIFOs. |
| 72 | */ | 72 | */ |
| 73 | 73 | ||