diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
| commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
| tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /drivers/mmc | |
| parent | 5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff) | |
| parent | 51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff) | |
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 4487cc09791..0aecaaebef3 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 = { | |||
| 2013 | static int __init omap_hsmmc_init(void) | 2013 | static int __init omap_hsmmc_init(void) |
| 2014 | { | 2014 | { |
| 2015 | /* Register the MMC driver */ | 2015 | /* Register the MMC driver */ |
| 2016 | return platform_driver_register(&omap_hsmmc_driver); | 2016 | return platform_driver_probe(&omap_hsmmc_driver, omap_hsmmc_probe); |
| 2017 | } | 2017 | } |
| 2018 | 2018 | ||
| 2019 | static void __exit omap_hsmmc_cleanup(void) | 2019 | static void __exit omap_hsmmc_cleanup(void) |