diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2006-01-24 15:34:47 -0500 |
| commit | 0a0fc0ddbe732779366ab6b1b879f62195e65967 (patch) | |
| tree | 7b42490a676cf39ae0691b6859ecf7fd410f229b /include/asm-arm/arch-sa1100/dma.h | |
| parent | 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a (diff) | |
| parent | 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'include/asm-arm/arch-sa1100/dma.h')
| -rw-r--r-- | include/asm-arm/arch-sa1100/dma.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-arm/arch-sa1100/dma.h b/include/asm-arm/arch-sa1100/dma.h index 3d60ed9f8c34..02575d72ac6b 100644 --- a/include/asm-arm/arch-sa1100/dma.h +++ b/include/asm-arm/arch-sa1100/dma.h | |||
| @@ -15,20 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | /* | 17 | /* |
| 18 | * This is the maximum DMA address that can be DMAd to. | ||
| 19 | */ | ||
| 20 | #define MAX_DMA_ADDRESS 0xffffffff | ||
| 21 | |||
| 22 | |||
| 23 | /* | ||
| 24 | * The regular generic DMA interface is inappropriate for the | ||
| 25 | * SA1100 DMA model. None of the SA1100 specific drivers using | ||
| 26 | * DMA are portable anyway so it's pointless to try to twist the | ||
| 27 | * regular DMA API to accommodate them. | ||
| 28 | */ | ||
| 29 | #define MAX_DMA_CHANNELS 0 | ||
| 30 | |||
| 31 | /* | ||
| 32 | * The SA1100 has six internal DMA channels. | 18 | * The SA1100 has six internal DMA channels. |
| 33 | */ | 19 | */ |
| 34 | #define SA1100_DMA_CHANNELS 6 | 20 | #define SA1100_DMA_CHANNELS 6 |