From e5510a73ab48402924aa2a7b48e181a6536d4493 Mon Sep 17 00:00:00 2001 From: Jaehoon Chung Date: Thu, 23 Aug 2012 20:31:48 +0900 Subject: [PATCH] --- yaml --- r: 332813 b: refs/heads/master c: 36c179a98a0755b98153e8f4ae08243fbfcd18ff h: refs/heads/master i: 332811: def2acf596ad7490fb0b75d6c649d296a5ad86b6 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/dw_mmc-pltfm.c | 4 ++-- trunk/drivers/mmc/host/dw_mmc.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 553cdf0e1ea9..44e77230c4dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b37f9d98f3d28ad98cc6c1894159312914f49190 +refs/heads/master: 36c179a98a0755b98153e8f4ae08243fbfcd18ff diff --git a/trunk/drivers/mmc/host/dw_mmc-pltfm.c b/trunk/drivers/mmc/host/dw_mmc-pltfm.c index 92ec3eb3aae7..a54d3a359ccd 100644 --- a/trunk/drivers/mmc/host/dw_mmc-pltfm.c +++ b/trunk/drivers/mmc/host/dw_mmc-pltfm.c @@ -21,7 +21,7 @@ #include #include "dw_mmc.h" -static int dw_mci_pltfm_probe(struct platform_device *pdev) +static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev) { struct dw_mci *host; struct resource *regs; @@ -62,7 +62,7 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev) return ret; } -static int __exit dw_mci_pltfm_remove(struct platform_device *pdev) +static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev) { struct dw_mci *host = platform_get_drvdata(pdev); diff --git a/trunk/drivers/mmc/host/dw_mmc.c b/trunk/drivers/mmc/host/dw_mmc.c index af40d227bece..36f98c09715e 100644 --- a/trunk/drivers/mmc/host/dw_mmc.c +++ b/trunk/drivers/mmc/host/dw_mmc.c @@ -1767,7 +1767,7 @@ static void dw_mci_work_routine_card(struct work_struct *work) } } -static int __init dw_mci_init_slot(struct dw_mci *host, unsigned int id) +static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) { struct mmc_host *mmc; struct dw_mci_slot *slot;