diff options
| author | Xinyu Chen <b03824@freescale.com> | 2012-02-15 16:23:38 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2012-02-15 16:23:38 +0800 |
| commit | 84c89d0f4db2ed1f547b1688701e0403a56957c4 (patch) | |
| tree | 1303318c0c0090d2e6780e05781276b430d62545 /include/linux/mmc | |
| parent | 84fb4db825be067f6fd07117280f59d685516baf (diff) | |
| parent | 1307bf6dc0ab5100544551ae6616a1b83b78cfad (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_arm2.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
drivers/mmc/core/bus.c
Diffstat (limited to 'include/linux/mmc')
| -rw-r--r-- | include/linux/mmc/card.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 686434404651..b8ed8398240b 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -401,7 +401,7 @@ struct mmc_driver { struct device_driver drv; int (*probe)(struct mmc_card *); void (*remove)(struct mmc_card *); - int (*suspend)(struct mmc_card *, pm_message_t); + int (*suspend)(struct mmc_card *); int (*resume)(struct mmc_card *); }; |