diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 13:45:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-11 13:45:21 -0400 |
| commit | 254c44ea822066e24ab5efbdff1e43b8fe45ae76 (patch) | |
| tree | 547f6fd4ce1bd6dba6a5cc5184df28501d550795 /drivers/mmc/core/bus.c | |
| parent | 7b76415375ba91f5a06f8d5179278c03d6151d16 (diff) | |
| parent | 6ac77e469e991e9dd91b28e503fa24b5609eedba (diff) | |
Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stable
Diffstat (limited to 'drivers/mmc/core/bus.c')
| -rw-r--r-- | drivers/mmc/core/bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 63667a8f140c..d6d62fd07ee9 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c | |||
| @@ -284,6 +284,7 @@ int mmc_add_card(struct mmc_card *card) | |||
| 284 | type = "SD-combo"; | 284 | type = "SD-combo"; |
| 285 | if (mmc_card_blockaddr(card)) | 285 | if (mmc_card_blockaddr(card)) |
| 286 | type = "SDHC-combo"; | 286 | type = "SDHC-combo"; |
| 287 | break; | ||
| 287 | default: | 288 | default: |
| 288 | type = "?"; | 289 | type = "?"; |
| 289 | break; | 290 | break; |