diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /arch/arm/mach-sa1100 | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/dma.c b/arch/arm/mach-sa1100/dma.c index cb4521a6f42d..ad660350c296 100644 --- a/arch/arm/mach-sa1100/dma.c +++ b/arch/arm/mach-sa1100/dma.c | |||
| @@ -65,7 +65,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id) | |||
| 65 | 65 | ||
| 66 | 66 | ||
| 67 | /** | 67 | /** |
| 68 | * sa1100_request_dma - allocate one of the SA11x0's DMA chanels | 68 | * sa1100_request_dma - allocate one of the SA11x0's DMA channels |
| 69 | * @device: The SA11x0 peripheral targeted by this request | 69 | * @device: The SA11x0 peripheral targeted by this request |
| 70 | * @device_id: An ascii name for the claiming device | 70 | * @device_id: An ascii name for the claiming device |
| 71 | * @callback: Function to be called when the DMA completes | 71 | * @callback: Function to be called when the DMA completes |