Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 96975
b: refs/heads/master
c: 86ad793
h: refs/heads/master
i:
  96973: 963f29e
  96971: 1ac6fe9
  96967: 9203b16
  96959: 33dbf1a
v: v3
  • Loading branch information
Cliff Cai authored and Bryan Wu committed May 17, 2008
1 parent 6d170d4 commit c22524a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c6c6f75d54ca734c409e336245662934c21fcee0
refs/heads/master: 86ad79321cbacdc4deebcde81849d19e26dd18e2
2 changes: 2 additions & 0 deletions trunk/arch/blackfin/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,8 @@ choice
prompt "Uncached SDRAM region"
default DMA_UNCACHED_1M
depends on BFIN_DMA_5XX
config DMA_UNCACHED_4M
bool "Enable 4M DMA region"
config DMA_UNCACHED_2M
bool "Enable 2M DMA region"
config DMA_UNCACHED_1M
Expand Down
4 changes: 3 additions & 1 deletion trunk/include/asm-blackfin/bfin-global.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
#include <linux/linkage.h>
#include <linux/types.h>

#if defined(CONFIG_DMA_UNCACHED_2M)
#if defined(CONFIG_DMA_UNCACHED_4M)
# define DMA_UNCACHED_REGION (4 * 1024 * 1024)
#elif defined(CONFIG_DMA_UNCACHED_2M)
# define DMA_UNCACHED_REGION (2 * 1024 * 1024)
#elif defined(CONFIG_DMA_UNCACHED_1M)
# define DMA_UNCACHED_REGION (1024 * 1024)
Expand Down

0 comments on commit c22524a

Please sign in to comment.