Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95701
b: refs/heads/master
c: 6cca491
h: refs/heads/master
i:
  95699: 846e662
v: v3
  • Loading branch information
Sebastian Siewior authored and Linus Torvalds committed May 1, 2008
1 parent a495e25 commit 3c921f5
Show file tree
Hide file tree
Showing 2 changed files with 3 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: cff28b56bdafd314836f4193b638b88d9b3cb5b1
refs/heads/master: 6cca49173198e1666cb9852649f66e1dba99d88a
3 changes: 2 additions & 1 deletion trunk/include/asm-m68knommu/dma.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
/*
* Set number of channels of DMA on ColdFire for different implementations.
*/
#if defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
#if defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407) || \
defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x)
#define MAX_M68K_DMA_CHANNELS 4
#elif defined(CONFIG_M5272)
#define MAX_M68K_DMA_CHANNELS 1
Expand Down

0 comments on commit 3c921f5

Please sign in to comment.