git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
sh
/
drivers
/
dma
/
dma-g2.c
diff --git
a/arch/sh/drivers/dma/dma-g2.c
b/arch/sh/drivers/dma/dma-g2.c
index
231e3f6
..
5afab6f
100644
(file)
--- a/
arch/sh/drivers/dma/dma-g2.c
+++ b/
arch/sh/drivers/dma/dma-g2.c
@@
-140,7
+140,7
@@
static struct dma_ops g2_dma_ops = {
};
static struct dma_info g2_dma_info = {
};
static struct dma_info g2_dma_info = {
- .name = "
G2 DMA
",
+ .name = "
g2_dmac
",
.nr_channels = 4,
.ops = &g2_dma_ops,
.flags = DMAC_CHANNELS_TEI_CAPABLE,
.nr_channels = 4,
.ops = &g2_dma_ops,
.flags = DMAC_CHANNELS_TEI_CAPABLE,
@@
-160,6
+160,7
@@
static int __init g2_dma_init(void)
static void __exit g2_dma_exit(void)
{
free_irq(HW_EVENT_G2_DMA, 0);
static void __exit g2_dma_exit(void)
{
free_irq(HW_EVENT_G2_DMA, 0);
+ unregister_dmac(&g2_dma_info);
}
subsys_initcall(g2_dma_init);
}
subsys_initcall(g2_dma_init);