summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-11-04 16:10:35 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-11-04 16:10:35 +0900
commitb6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch)
treeae4139b2af5af7e382208645d4b66ff184c1e53a /drivers/mmc
parent5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff)
parent51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff)
downloadop-kernel-dev-b6d0137d6156db54a9e6ff74458ed4342a45abb5.zip
op-kernel-dev-b6d0137d6156db54a9e6ff74458ed4342a45abb5.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/omap_hsmmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 4487cc0..0aecaae 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -2013,7 +2013,7 @@ static struct platform_driver omap_hsmmc_driver = {
static int __init omap_hsmmc_init(void)
{
/* Register the MMC driver */
- return platform_driver_register(&omap_hsmmc_driver);
+ return platform_driver_probe(&omap_hsmmc_driver, omap_hsmmc_probe);
}
static void __exit omap_hsmmc_cleanup(void)
OpenPOWER on IntegriCloud