diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-14 08:38:28 -0500 |
| commit | 0c3c35e148dbc03106038dd25816fb9f3a084d86 (patch) | |
| tree | 8b8cc6a027353a0f242f61362b35b0942da61b83 /drivers/mmc/host/omap_hsmmc.c | |
| parent | 50d40f187f9182ee8caa1b83f80a0e11e2226baa (diff) | |
| parent | 5e08fe570c2dbabb5015c37049eb9a451e55c890 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
| -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) |