xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'pending-misc' (early part) into devel

Browse Source
This commit is contained in:
Russell King
2009-12-04 14:59:47 +00:00
parent e0ee98513d 6060e8df51
commit 5cb2faa6ed
1222 changed files with 22215 additions and 12662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mmc/host/at91_mci.c
View File

@@ -72,7 +72,6 @@
#include <asm/irq.h>
#include <asm/gpio.h>
#include <asm/mach/mmc.h>
#include <mach/board.h>
#include <mach/cpu.h>
#include <mach/at91_mci.h>

1
drivers/mmc/host/omap.c
View File

@@ -1529,6 +1529,7 @@ static int mmc_omap_remove(struct platform_device *pdev)
host->pdata->cleanup(&pdev->dev);
mmc_omap_fclk_enable(host, 0);
free_irq(host->irq, host);
clk_put(host->fclk);
clk_disable(host->iclk);
clk_put(host->iclk);

2
drivers/mmc/host/omap_hsmmc.c
View File

@@ -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)