aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 09:19:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-03 09:19:54 -0800
commitdf9d38ebda762e54ed0b142c2c47b2f57a145ab2 (patch)
tree24fbfb229eabf74a2b2ed887e5b4d1b4bd7dae29 /drivers
parentMerge branch 'fbdev-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 (diff)
parentMerge branch 'sh/urgent' into sh-fixes-for-linus (diff)
downloadlinux-dev-df9d38ebda762e54ed0b142c2c47b2f57a145ab2.tar.xz
linux-dev-df9d38ebda762e54ed0b142c2c47b2f57a145ab2.zip
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: se/7724: Remove FSI/B of GPIO init code sh: se/7724: Update clock framework of FSI clock to non-legacy sh: Assume new page cache pages have dirty dcache lines. sh: boards: mach-se: use IS_ERR() instead of NULL check sh: Add div6_reparent_clks to clock framework for FSI dma: shdma: add a MODULE_ALIAS() to allow module autoloading
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/shdma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index eb6b54dbb806..85ffd5e38c50 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -1213,3 +1213,4 @@ module_exit(sh_dmae_exit);
MODULE_AUTHOR("Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>");
MODULE_DESCRIPTION("Renesas SH DMA Engine driver");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sh-dma-engine");