Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133327
b: refs/heads/master
c: 02ebd32
h: refs/heads/master
i:
  133325: cd10496
  133323: dd2bfab
  133319: 497e256
  133311: 128e0f6
v: v3
  • Loading branch information
Nobuhiro Iwamatsu authored and Paul Mundt committed Mar 16, 2009
1 parent 2ba92d4 commit e26e954
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a83c0b739f3ad1887704cfa9f1ee5ee208cf1532
refs/heads/master: 02ebd32f52c10f90f810e85d0281e9e81dd6e741
2 changes: 2 additions & 0 deletions trunk/arch/sh/drivers/dma/dma-sh.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ static struct dma_info sh_dmac_info = {
.flags = DMAC_CHANNELS_TEI_CAPABLE,
};

#ifdef CONFIG_CPU_SH4
static unsigned int get_dma_error_irq(int n)
{
#if defined(DMAC_IRQ_MULTI)
Expand All @@ -293,6 +294,7 @@ static unsigned int get_dma_error_irq(int n)
#endif
#endif
}
#endif

static int __init sh_dmac_init(void)
{
Expand Down

0 comments on commit e26e954

Please sign in to comment.