diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 16:10:35 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 16:10:35 +0900 |
| commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
| tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /drivers/mmc | |
| parent | 5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff) | |
| parent | 51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff) | |
| download | linux-b6d0137d6156db54a9e6ff74458ed4342a45abb5.tar.gz linux-b6d0137d6156db54a9e6ff74458ed4342a45abb5.tar.bz2 linux-b6d0137d6156db54a9e6ff74458ed4342a45abb5.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 4487cc097911..0aecaaebef3d 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) |