diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 19:33:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-19 19:33:29 -0400 |
| commit | 754cdd4aba225b74dcc35cc384aeb0c42b505e8b (patch) | |
| tree | 8647f635336748667d68e68940dec1fcf88d51dd /include/asm-blackfin/bfin-global.h | |
| parent | db07b02304d0d70bf8273abc93d94e4c8d2f9cec (diff) | |
| parent | 460ed2ea04da012e5575eb357a47a7f6407767de (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin SPORTS UART Driver: converting BFIN->BLACKFIN
Blackfin serial driver: add extra IRQ flag for 8250 serial driver
8250 Serial Driver: Added support for 8250-class UARTs in HV Sistemas H8606 board
Blackfin arch: Fix bug - USB fails to build for BF524/BF526
Blackfin arch: update boards defconfig files
Blackfin arch: IO Port functions to read/write unalligned memory
Blackfin arch: enable a choice to provide 4M DMA memory
Blackfin arch: cleanup the icplb/dcplb multiple hit checks
Blackfin arch: Add workaround to read edge triggered GPIOs
Blackfin arch: Sync channel defines with struct dma_register dma_io_base_addr.
Blackfin arch: Check for Anomaly 05000182
[Blackfin] arch: rename bf5xx-flash to bfin-async-flash
[Blackfin] arch: Blackfin checksum annotations
Diffstat (limited to 'include/asm-blackfin/bfin-global.h')
| -rw-r--r-- | include/asm-blackfin/bfin-global.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-blackfin/bfin-global.h b/include/asm-blackfin/bfin-global.h index 716df7c85923..a9248d883675 100644 --- a/include/asm-blackfin/bfin-global.h +++ b/include/asm-blackfin/bfin-global.h | |||
| @@ -37,7 +37,9 @@ | |||
| 37 | #include <linux/linkage.h> | 37 | #include <linux/linkage.h> |
| 38 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 39 | 39 | ||
| 40 | #if defined(CONFIG_DMA_UNCACHED_2M) | 40 | #if defined(CONFIG_DMA_UNCACHED_4M) |
| 41 | # define DMA_UNCACHED_REGION (4 * 1024 * 1024) | ||
| 42 | #elif defined(CONFIG_DMA_UNCACHED_2M) | ||
| 41 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) | 43 | # define DMA_UNCACHED_REGION (2 * 1024 * 1024) |
| 42 | #elif defined(CONFIG_DMA_UNCACHED_1M) | 44 | #elif defined(CONFIG_DMA_UNCACHED_1M) |
| 43 | # define DMA_UNCACHED_REGION (1024 * 1024) | 45 | # define DMA_UNCACHED_REGION (1024 * 1024) |