diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 02:29:26 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-07 02:29:26 +0100 |
| commit | 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee (patch) | |
| tree | 4f4e321a1ca0baf64d8af528080c71f93495a7d7 /drivers/dma/shdma.h | |
| parent | ARM: mach-shmobile: mackerel: Add HDMI sound support (diff) | |
| parent | Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.tar.xz linux-5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/Kconfig
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/dma/shdma.h')
| -rw-r--r-- | drivers/dma/shdma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/shdma.h b/drivers/dma/shdma.h index 4021275a0a43..52e4fb173805 100644 --- a/drivers/dma/shdma.h +++ b/drivers/dma/shdma.h @@ -43,6 +43,7 @@ struct sh_dmae_device { struct dma_device common; struct sh_dmae_chan *chan[SH_DMAC_MAX_CHANNELS]; struct sh_dmae_pdata *pdata; + struct list_head node; u32 __iomem *chan_reg; u16 __iomem *dmars; }; |